/ SGI Freeware 1999 August / SGI Freeware 1999 August.iso / dist / fw_emacs.idb / usr / freeware / share / emacs / 19.34 / lisp / ediff-mult.elc.z / ediff-mult.elc

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6b 77 7a 68 40 6e 75 |piled by| kwzh@nu|
|00000020| 74 72 69 6d 61 74 2e 67 | 6e 75 2e 61 69 2e 6d 69 |trimat.g|nu.ai.mi|
|00000030| 74 2e 65 64 75 20 6f 6e | 20 57 65 64 20 4a 75 6c |t.edu on| Wed Jul|
|00000040| 20 31 37 20 31 35 3a 34 | 32 3a 34 33 20 31 39 39 | 17 15:4|2:43 199|
|00000050| 36 0a 3b 3b 3b 20 66 72 | 6f 6d 20 66 69 6c 65 20 |6.;;; fr|om file |
|00000060| 2f 67 64 2f 67 6e 75 2f | 65 6d 61 63 73 2f 31 39 |/gd/gnu/|emacs/19|
|00000070| 2e 30 2f 6c 69 73 70 2f | 65 64 69 66 66 2d 6d 75 |.0/lisp/|ediff-mu|
|00000080| 6c 74 2e 65 6c 0a 3b 3b | 3b 20 65 6d 61 63 73 20 |lt.el.;;|; emacs |
|00000090| 76 65 72 73 69 6f 6e 20 | 31 39 2e 33 31 2e 39 34 |version |19.31.94|
|000000a0| 2e 31 2e 0a 3b 3b 3b 20 | 62 79 74 65 63 6f 6d 70 |.1..;;; |bytecomp|
|000000b0| 20 76 65 72 73 69 6f 6e | 20 46 53 46 20 32 2e 31 | version| FSF 2.1|
|000000c0| 30 0a 3b 3b 3b 20 6f 70 | 74 69 6d 69 7a 61 74 69 |0.;;; op|timizati|
|000000d0| 6f 6e 20 69 73 20 6f 6e | 2e 0a 3b 3b 3b 20 74 68 |on is on|..;;; th|
|000000e0| 69 73 20 66 69 6c 65 20 | 75 73 65 73 20 6f 70 63 |is file |uses opc|
|000000f0| 6f 64 65 73 20 77 68 69 | 63 68 20 64 6f 20 6e 6f |odes whi|ch do no|
|00000100| 74 20 65 78 69 73 74 20 | 69 6e 20 45 6d 61 63 73 |t exist |in Emacs|
|00000110| 20 31 38 2e 0a 0a 28 69 | 66 20 28 61 6e 64 20 28 | 18...(i|f (and (|
|00000120| 62 6f 75 6e 64 70 20 27 | 65 6d 61 63 73 2d 76 65 |boundp '|emacs-ve|
|00000130| 72 73 69 6f 6e 29 0a 09 | 20 28 6f 72 20 28 61 6e |rsion)..| (or (an|
|00000140| 64 20 28 62 6f 75 6e 64 | 70 20 27 65 70 6f 63 68 |d (bound|p 'epoch|
|00000150| 3a 3a 76 65 72 73 69 6f | 6e 29 20 65 70 6f 63 68 |::versio|n) epoch|
|00000160| 3a 3a 76 65 72 73 69 6f | 6e 29 0a 09 20 20 20 20 |::versio|n)..    |
|00000170| 20 28 73 74 72 69 6e 67 | 2d 6c 65 73 73 70 20 65 | (string|-lessp e|
|00000180| 6d 61 63 73 2d 76 65 72 | 73 69 6f 6e 20 22 31 39 |macs-ver|sion "19|
|00000190| 2e 32 39 22 29 29 29 0a | 20 20 20 20 28 65 72 72 |.29"))).|    (err|
|000001a0| 6f 72 20 22 60 65 64 69 | 66 66 2d 6d 75 6c 74 2e |or "`edi|ff-mult.|
|000001b0| 65 6c 27 20 77 61 73 20 | 63 6f 6d 70 69 6c 65 64 |el' was |compiled|
|000001c0| 20 66 6f 72 20 45 6d 61 | 63 73 20 31 39 2e 32 39 | for Ema|cs 19.29|
|000001d0| 20 6f 72 20 6c 61 74 65 | 72 22 29 29 0a 0a 0a 28 | or late|r"))...(|
|000001e0| 72 65 71 75 69 72 65 20 | 28 71 75 6f 74 65 20 65 |require |(quote e|
|000001f0| 64 69 66 66 2d 69 6e 69 | 74 29 29 0a 23 40 32 20 |diff-ini|t)).#@2 |
|00000200| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|00000210| 6d 65 74 61 2d 62 75 66 | 66 65 72 20 6e 69 6c 20 |meta-buf|fer nil |
|00000220| 28 23 24 20 2e 20 35 31 | 32 29 29 0a 28 62 79 74 |(#$ . 51|2)).(byt|
|00000230| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 c3 c4 |e-code "|..!.....|
|00000240| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|00000250| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00000260| 65 64 69 66 66 2d 6d 65 | 74 61 2d 62 75 66 66 65 |ediff-me|ta-buffe|
|00000270| 72 20 70 75 74 20 70 65 | 72 6d 61 6e 65 6e 74 2d |r put pe|rmanent-|
|00000280| 6c 6f 63 61 6c 20 74 5d | 20 34 29 0a 23 40 32 20 |local t]| 4).#@2 |
|00000290| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|000002a0| 70 61 72 65 6e 74 2d 6d | 65 74 61 2d 62 75 66 66 |parent-m|eta-buff|
|000002b0| 65 72 20 6e 69 6c 20 28 | 23 24 20 2e 20 36 35 36 |er nil (|#$ . 656|
|000002c0| 29 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |)).(byte|-code ".|
|000002d0| c1 21 88 c2 c1 c3 c4 23 | 88 c5 c6 21 84 13 00 c7 |.!.....#|...!....|
|000002e0| 16 06 c6 0e 08 42 16 08 | c9 16 5c 6e ca 0e 08 42 |.....B..|..\n...B|
|000002f0| 16 08 c7 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |...." [m|ake-vari|
|00000300| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00000310| 6c 20 65 64 69 66 66 2d | 70 61 72 65 6e 74 2d 6d |l ediff-|parent-m|
|00000320| 65 74 61 2d 62 75 66 66 | 65 72 20 70 75 74 20 70 |eta-buff|er put p|
|00000330| 65 72 6d 61 6e 65 6e 74 | 2d 6c 6f 63 61 6c 20 74 |ermanent|-local t|
|00000340| 20 62 6f 75 6e 64 70 20 | 65 64 69 66 66 2d 72 65 | boundp |ediff-re|
|00000350| 67 69 73 74 72 79 2d 62 | 75 66 66 65 72 20 6e 69 |gistry-b|uffer ni|
|00000360| 6c 20 63 75 72 72 65 6e | 74 2d 6c 6f 61 64 2d 6c |l curren|t-load-l|
|00000370| 69 73 74 20 22 54 68 69 | 73 20 69 73 20 61 6e 20 |ist "Thi|s is an |
|00000380| 45 64 69 66 66 20 53 65 | 73 73 69 6f 6e 20 47 72 |Ediff Se|ssion Gr|
|00000390| 6f 75 70 20 50 61 6e 65 | 6c 3a 20 25 73 5c 6e 5c |oup Pane|l: %s\n\|
|000003a0| 6e 55 73 65 66 75 6c 20 | 63 6f 6d 6d 61 6e 64 73 |nUseful |commands|
|000003b0| 3a 5c 6e 20 20 20 20 20 | 62 75 74 74 6f 6e 32 2c |:\n     |button2,|
|000003c0| 20 60 76 27 2c 20 52 45 | 54 20 6f 76 65 72 20 61 | `v', RE|T over a|
|000003d0| 20 73 65 73 73 69 6f 6e | 20 6c 69 6e 65 3a 20 20 | session| line:  |
|000003e0| 20 73 74 61 72 74 20 74 | 68 61 74 20 45 64 69 66 | start t|hat Edif|
|000003f0| 66 20 73 65 73 73 69 6f | 6e 5c 6e 20 20 20 20 20 |f sessio|n\n     |
|00000400| 60 4d 27 3a 09 69 6e 20 | 61 6e 79 20 73 65 73 73 |`M':.in |any sess|
|00000410| 69 6f 6e 20 69 6e 76 6f | 6b 65 64 20 66 72 6f 6d |ion invo|ked from|
|00000420| 20 68 65 72 65 2c 20 62 | 72 69 6e 67 73 20 62 61 | here, b|rings ba|
|00000430| 63 6b 20 74 68 69 73 20 | 67 72 6f 75 70 20 70 61 |ck this |group pa|
|00000440| 6e 65 6c 5c 6e 20 20 20 | 20 20 60 52 27 3a 09 64 |nel\n   |  `R':.d|
|00000450| 69 73 70 6c 61 79 20 74 | 68 65 20 72 65 67 69 73 |isplay t|he regis|
|00000460| 74 72 79 20 6f 66 20 61 | 63 74 69 76 65 20 45 64 |try of a|ctive Ed|
|00000470| 69 66 66 20 73 65 73 73 | 69 6f 6e 73 5c 6e 20 20 |iff sess|ions\n  |
|00000480| 20 20 20 60 68 27 3a 09 | 6d 61 72 6b 20 73 65 73 |   `h':.|mark ses|
|00000490| 73 69 6f 6e 20 66 6f 72 | 20 68 69 64 69 6e 67 20 |sion for| hiding |
|000004a0| 28 74 6f 67 67 6c 65 29 | 5c 6e 20 20 20 20 20 60 |(toggle)|\n     `|
|000004b0| 78 27 3a 09 68 69 64 65 | 20 6d 61 72 6b 65 64 20 |x':.hide| marked |
|000004c0| 73 65 73 73 69 6f 6e 73 | 3b 20 77 69 74 68 20 70 |sessions|; with p|
|000004d0| 72 65 66 69 78 20 61 72 | 67 2d 2d 75 6e 68 69 64 |refix ar|g--unhid|
|000004e0| 65 20 68 69 64 64 65 6e | 20 73 65 73 73 69 6f 6e |e hidden| session|
|000004f0| 73 5c 6e 20 20 20 20 20 | 60 6d 27 3a 09 6d 61 72 |s\n     |`m':.mar|
|00000500| 6b 20 73 65 73 73 69 6f | 6e 20 66 6f 72 20 61 20 |k sessio|n for a |
|00000510| 6e 6f 6e 2d 68 69 64 69 | 6e 67 20 6f 70 65 72 61 |non-hidi|ng opera|
|00000520| 74 69 6f 6e 20 28 74 6f | 67 67 6c 65 29 5c 6e 20 |tion (to|ggle)\n |
|00000530| 20 20 20 20 53 50 43 3a | 09 6e 65 78 74 20 73 65 |    SPC:|.next se|
|00000540| 73 73 69 6f 6e 5c 6e 20 | 20 20 20 20 44 45 4c 3a |ssion\n |    DEL:|
|00000550| 09 70 72 65 76 69 6f 75 | 73 20 73 65 73 73 69 6f |.previou|s sessio|
|00000560| 6e 5c 6e 20 20 20 20 20 | 60 45 27 3a 09 62 72 6f |n\n     |`E':.bro|
|00000570| 77 73 65 20 45 64 69 66 | 66 20 6f 6e 2d 6c 69 6e |wse Edif|f on-lin|
|00000580| 65 20 6d 61 6e 75 61 6c | 5c 6e 20 20 20 20 20 60 |e manual|\n     `|
|00000590| 71 27 3a 09 71 75 69 74 | 20 74 68 69 73 20 73 65 |q':.quit| this se|
|000005a0| 73 73 69 6f 6e 20 67 72 | 6f 75 70 5c 6e 22 20 65 |ssion gr|oup\n" e|
|000005b0| 64 69 66 66 2d 6d 65 74 | 61 2d 62 75 66 66 65 72 |diff-met|a-buffer|
|000005c0| 2d 6d 65 73 73 61 67 65 | 5d 20 34 29 0a 23 40 33 |-message|] 4).#@3|
|000005d0| 33 20 54 68 65 20 6b 65 | 79 6d 61 70 20 66 6f 72 |3 The ke|ymap for|
|000005e0| 20 74 68 65 20 6d 65 74 | 61 20 62 75 66 66 65 72 | the met|a buffer|
|000005f0| 2e 1f 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |...(defv|ar ediff|
|00000600| 2d 6d 65 74 61 2d 62 75 | 66 66 65 72 2d 6d 61 70 |-meta-bu|ffer-map|
|00000610| 20 6e 69 6c 20 28 23 24 | 20 2e 20 31 34 39 30 29 | nil (#$| . 1490)|
|00000620| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|00000630| 21 88 c2 c1 c3 c4 23 87 | 22 20 5b 6d 61 6b 65 2d |!.....#.|" [make-|
|00000640| 76 61 72 69 61 62 6c 65 | 2d 62 75 66 66 65 72 2d |variable|-buffer-|
|00000650| 6c 6f 63 61 6c 20 65 64 | 69 66 66 2d 6d 65 74 61 |local ed|iff-meta|
|00000660| 2d 62 75 66 66 65 72 2d | 6d 61 70 20 70 75 74 20 |-buffer-|map put |
|00000670| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|00000680| 74 5d 20 34 29 0a 23 40 | 38 33 20 54 68 65 20 6b |t] 4).#@|83 The k|
|00000690| 65 79 6d 61 70 20 74 6f | 20 62 65 20 69 6e 73 74 |eymap to| be inst|
|000006a0| 61 6c 6c 65 64 20 69 6e | 20 74 68 65 20 62 75 66 |alled in| the buf|
|000006b0| 66 65 72 20 73 68 6f 77 | 69 6e 67 20 64 69 66 66 |fer show|ing diff|
|000006c0| 65 72 65 6e 63 65 73 20 | 62 65 74 77 65 65 6e 0a |erences |between.|
|000006d0| 64 69 72 65 63 74 6f 72 | 69 65 73 2e 1f 0a 28 64 |director|ies...(d|
|000006e0| 65 66 76 61 72 20 65 64 | 69 66 66 2d 64 69 72 2d |efvar ed|iff-dir-|
|000006f0| 64 69 66 66 73 2d 62 75 | 66 66 65 72 2d 6d 61 70 |diffs-bu|ffer-map|
|00000700| 20 28 6d 61 6b 65 2d 73 | 70 61 72 73 65 2d 6b 65 | (make-s|parse-ke|
|00000710| 79 6d 61 70 29 20 28 23 | 24 20 2e 20 31 36 37 35 |ymap) (#|$ . 1675|
|00000720| 29 29 0a 23 40 32 20 1f | 0a 28 64 65 66 76 61 72 |)).#@2 .|.(defvar|
|00000730| 20 65 64 69 66 66 2d 6d | 65 74 61 2d 61 63 74 69 | ediff-m|eta-acti|
|00000740| 6f 6e 2d 66 75 6e 63 74 | 69 6f 6e 20 6e 69 6c 20 |on-funct|ion nil |
|00000750| 28 23 24 20 2e 20 31 38 | 33 31 29 29 0a 28 62 79 |(#$ . 18|31)).(by|
|00000760| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|00000770| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00000780| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00000790| 20 65 64 69 66 66 2d 6d | 65 74 61 2d 61 63 74 69 | ediff-m|eta-acti|
|000007a0| 6f 6e 2d 66 75 6e 63 74 | 69 6f 6e 20 70 75 74 20 |on-funct|ion put |
|000007b0| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|000007c0| 74 5d 20 34 29 0a 23 40 | 32 20 1f 0a 28 64 65 66 |t] 4).#@|2 ..(def|
|000007d0| 76 61 72 20 65 64 69 66 | 66 2d 6d 65 74 61 2d 72 |var edif|f-meta-r|
|000007e0| 65 64 72 61 77 2d 66 75 | 6e 63 74 69 6f 6e 20 6e |edraw-fu|nction n|
|000007f0| 69 6c 20 28 23 24 20 2e | 20 31 39 39 34 29 29 0a |il (#$ .| 1994)).|
|00000800| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00000810| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|00000820| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00000830| 63 61 6c 20 65 64 69 66 | 66 2d 6d 65 74 61 2d 72 |cal edif|f-meta-r|
|00000840| 65 64 72 61 77 2d 66 75 | 6e 63 74 69 6f 6e 20 70 |edraw-fu|nction p|
|00000850| 75 74 20 70 65 72 6d 61 | 6e 65 6e 74 2d 6c 6f 63 |ut perma|nent-loc|
|00000860| 61 6c 20 74 5d 20 34 29 | 0a 23 40 32 20 1f 0a 28 |al t] 4)|.#@2 ..(|
|00000870| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 73 65 73 |defvar e|diff-ses|
|00000880| 73 69 6f 6e 2d 61 63 74 | 69 6f 6e 2d 66 75 6e 63 |sion-act|ion-func|
|00000890| 74 69 6f 6e 20 6e 69 6c | 20 28 23 24 20 2e 20 32 |tion nil| (#$ . 2|
|000008a0| 31 35 37 29 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |157)).(b|yte-code|
|000008b0| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|000008c0| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|000008d0| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|000008e0| 73 65 73 73 69 6f 6e 2d | 61 63 74 69 6f 6e 2d 66 |session-|action-f|
|000008f0| 75 6e 63 74 69 6f 6e 20 | 70 75 74 20 70 65 72 6d |unction |put perm|
|00000900| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 74 5d 20 34 |anent-lo|cal t] 4|
|00000910| 29 0a 23 40 32 20 1f 0a | 28 64 65 66 76 61 72 20 |).#@2 ..|(defvar |
|00000920| 65 64 69 66 66 2d 6d 65 | 74 61 6a 6f 62 2d 6e 61 |ediff-me|tajob-na|
|00000930| 6d 65 20 6e 69 6c 20 28 | 23 24 20 2e 20 32 33 32 |me nil (|#$ . 232|
|00000940| 36 29 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |6)).(byt|e-code "|
|00000950| c0 c1 21 88 c2 c1 c3 c4 | 23 87 22 20 5b 6d 61 6b |..!.....|#." [mak|
|00000960| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|00000970| 72 2d 6c 6f 63 61 6c 20 | 65 64 69 66 66 2d 6d 65 |r-local |ediff-me|
|00000980| 74 61 6a 6f 62 2d 6e 61 | 6d 65 20 70 75 74 20 70 |tajob-na|me put p|
|00000990| 65 72 6d 61 6e 65 6e 74 | 2d 6c 6f 63 61 6c 20 74 |ermanent|-local t|
|000009a0| 5d 20 34 29 0a 23 40 32 | 20 1f 0a 28 64 65 66 76 |] 4).#@2| ..(defv|
|000009b0| 61 72 20 65 64 69 66 66 | 2d 6d 65 74 61 2d 64 69 |ar ediff|-meta-di|
|000009c0| 66 66 2d 62 75 66 66 65 | 72 20 6e 69 6c 20 28 23 |ff-buffe|r nil (#|
|000009d0| 24 20 2e 20 32 34 37 33 | 29 29 0a 28 62 79 74 65 |$ . 2473|)).(byte|
|000009e0| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|000009f0| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00000a00| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00000a10| 64 69 66 66 2d 6d 65 74 | 61 2d 64 69 66 66 2d 62 |diff-met|a-diff-b|
|00000a20| 75 66 66 65 72 20 70 75 | 74 20 70 65 72 6d 61 6e |uffer pu|t perman|
|00000a30| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|00000a40| 23 40 32 20 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |#@2 ..(d|efvar ed|
|00000a50| 69 66 66 2d 66 69 6c 74 | 65 72 69 6e 67 2d 72 65 |iff-filt|ering-re|
|00000a60| 67 65 78 70 2d 68 69 73 | 74 6f 72 79 20 6e 69 6c |gexp-his|tory nil|
|00000a70| 20 28 23 24 20 2e 20 32 | 36 32 38 29 29 0a 23 40 | (#$ . 2|628)).#@|
|00000a80| 32 20 1f 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |2 ..(def|var edif|
|00000a90| 66 2d 6d 65 74 61 2d 6c | 69 73 74 20 6e 69 6c 20 |f-meta-l|ist nil |
|00000aa0| 28 23 24 20 2e 20 32 36 | 39 30 29 29 0a 28 62 79 |(#$ . 26|90)).(by|
|00000ab0| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|00000ac0| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00000ad0| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00000ae0| 20 65 64 69 66 66 2d 6d | 65 74 61 2d 6c 69 73 74 | ediff-m|eta-list|
|00000af0| 20 70 75 74 20 70 65 72 | 6d 61 6e 65 6e 74 2d 6c | put per|manent-l|
|00000b00| 6f 63 61 6c 20 74 5d 20 | 34 29 0a 23 40 32 20 1f |ocal t] |4).#@2 .|
|00000b10| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 64 |.(defvar| ediff-d|
|00000b20| 69 72 2d 64 69 66 66 65 | 72 65 6e 63 65 2d 6c 69 |ir-diffe|rence-li|
|00000b30| 73 74 20 6e 69 6c 20 28 | 23 24 20 2e 20 32 38 33 |st nil (|#$ . 283|
|00000b40| 31 29 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |1)).(byt|e-code "|
|00000b50| c0 c1 21 88 c2 c1 c3 c4 | 23 87 22 20 5b 6d 61 6b |..!.....|#." [mak|
|00000b60| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|00000b70| 72 2d 6c 6f 63 61 6c 20 | 65 64 69 66 66 2d 64 69 |r-local |ediff-di|
|00000b80| 72 2d 64 69 66 66 65 72 | 65 6e 63 65 2d 6c 69 73 |r-differ|ence-lis|
|00000b90| 74 20 70 75 74 20 70 65 | 72 6d 61 6e 65 6e 74 2d |t put pe|rmanent-|
|00000ba0| 6c 6f 63 61 6c 20 74 5d | 20 34 29 0a 23 40 32 20 |local t]| 4).#@2 |
|00000bb0| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|00000bc0| 64 69 72 2d 64 69 66 66 | 73 2d 62 75 66 66 65 72 |dir-diff|s-buffer|
|00000bd0| 20 6e 69 6c 20 28 23 24 | 20 2e 20 32 39 39 32 29 | nil (#$| . 2992)|
|00000be0| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|00000bf0| 21 88 c2 c1 c3 c4 23 88 | c5 c6 21 84 13 00 c7 16 |!.....#.|..!.....|
|00000c00| 06 c6 0e 08 42 16 08 c7 | 87 22 20 5b 6d 61 6b 65 |....B...|." [make|
|00000c10| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00000c20| 2d 6c 6f 63 61 6c 20 65 | 64 69 66 66 2d 64 69 72 |-local e|diff-dir|
|00000c30| 2d 64 69 66 66 73 2d 62 | 75 66 66 65 72 20 70 75 |-diffs-b|uffer pu|
|00000c40| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|00000c50| 6c 20 74 20 62 6f 75 6e | 64 70 20 65 64 69 66 66 |l t boun|dp ediff|
|00000c60| 2d 73 65 73 73 69 6f 6e | 2d 72 65 67 69 73 74 72 |-session|-registr|
|00000c70| 79 20 6e 69 6c 20 63 75 | 72 72 65 6e 74 2d 6c 6f |y nil cu|rrent-lo|
|00000c80| 61 64 2d 6c 69 73 74 5d | 20 34 29 0a 23 40 36 31 |ad-list]| 4).#@61|
|00000c90| 20 2a 48 6f 6f 6b 73 20 | 72 75 6e 20 6a 75 73 74 | *Hooks |run just|
|00000ca0| 20 61 66 74 65 72 20 74 | 68 65 20 72 65 67 69 73 | after t|he regis|
|00000cb0| 74 72 79 20 63 6f 6e 74 | 72 6f 6c 20 70 61 6e 65 |try cont|rol pane|
|00000cc0| 6c 20 69 73 20 73 65 74 | 20 75 70 2e 1f 0a 28 64 |l is set| up...(d|
|00000cd0| 65 66 76 61 72 20 65 64 | 69 66 66 2d 72 65 67 69 |efvar ed|iff-regi|
|00000ce0| 73 74 72 79 2d 73 65 74 | 75 70 2d 68 6f 6f 6b 20 |stry-set|up-hook |
|00000cf0| 6e 69 6c 20 28 23 24 20 | 2e 20 2d 33 32 31 37 29 |nil (#$ |. -3217)|
|00000d00| 29 0a 23 40 31 30 31 20 | 2a 48 6f 6f 6b 73 20 72 |).#@101 |*Hooks r|
|00000d10| 75 6e 20 6a 75 73 74 20 | 61 66 74 65 72 20 61 20 |un just |after a |
|00000d20| 6d 65 74 61 2d 62 75 66 | 66 65 72 20 63 6f 6e 74 |meta-buf|fer cont|
|00000d30| 72 6f 6c 6c 69 6e 67 20 | 61 20 73 65 73 73 69 6f |rolling |a sessio|
|00000d40| 6e 20 67 72 6f 75 70 2c | 20 73 75 63 68 20 61 73 |n group,| such as|
|00000d50| 0a 65 64 69 66 66 2d 64 | 69 72 65 63 74 6f 72 69 |.ediff-d|irectori|
|00000d60| 65 73 2c 20 69 73 20 72 | 75 6e 2e 1f 0a 28 64 65 |es, is r|un...(de|
|00000d70| 66 76 61 72 20 65 64 69 | 66 66 2d 73 65 73 73 69 |fvar edi|ff-sessi|
|00000d80| 6f 6e 2d 67 72 6f 75 70 | 2d 73 65 74 75 70 2d 68 |on-group|-setup-h|
|00000d90| 6f 6f 6b 20 6e 69 6c 20 | 28 23 24 20 2e 20 2d 33 |ook nil |(#$ . -3|
|00000da0| 33 33 36 29 29 0a 23 40 | 35 33 20 2a 48 6f 6f 6b |336)).#@|53 *Hook|
|00000db0| 73 20 72 75 6e 20 6a 75 | 73 74 20 61 66 74 65 72 |s run ju|st after|
|00000dc0| 20 74 68 65 20 72 65 67 | 69 73 74 72 79 20 62 75 | the reg|istry bu|
|00000dd0| 66 66 65 72 20 69 73 20 | 73 68 6f 77 6e 2e 1f 0a |ffer is |shown...|
|00000de0| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 73 68 |(defvar |ediff-sh|
|00000df0| 6f 77 2d 72 65 67 69 73 | 74 72 79 2d 68 6f 6f 6b |ow-regis|try-hook|
|00000e00| 20 6e 69 6c 20 28 23 24 | 20 2e 20 2d 33 34 39 39 | nil (#$| . -3499|
|00000e10| 29 29 0a 23 40 35 36 20 | 2a 48 6f 6f 6b 73 20 72 |)).#@56 |*Hooks r|
|00000e20| 75 6e 20 6a 75 73 74 20 | 61 66 74 65 72 20 61 20 |un just |after a |
|00000e30| 73 65 73 73 69 6f 6e 20 | 67 72 6f 75 70 20 62 75 |session |group bu|
|00000e40| 66 66 65 72 20 69 73 20 | 73 68 6f 77 6e 2e 1f 0a |ffer is |shown...|
|00000e50| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 73 68 |(defvar |ediff-sh|
|00000e60| 6f 77 2d 73 65 73 73 69 | 6f 6e 2d 67 72 6f 75 70 |ow-sessi|on-group|
|00000e70| 2d 68 6f 6f 6b 20 6e 69 | 6c 20 28 23 24 20 2e 20 |-hook ni|l (#$ . |
|00000e80| 2d 33 36 30 38 29 29 0a | 23 40 32 20 1f 0a 28 64 |-3608)).|#@2 ..(d|
|00000e90| 65 66 76 61 72 20 65 64 | 69 66 66 2d 6d 65 74 61 |efvar ed|iff-meta|
|00000ea0| 2d 70 61 74 63 68 62 75 | 66 65 72 20 6e 69 6c 20 |-patchbu|fer nil |
|00000eb0| 28 23 24 20 2e 20 33 37 | 32 34 29 29 0a 28 62 79 |(#$ . 37|24)).(by|
|00000ec0| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|00000ed0| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00000ee0| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00000ef0| 20 65 64 69 66 66 2d 6d | 65 74 61 2d 70 61 74 63 | ediff-m|eta-patc|
|00000f00| 68 62 75 66 65 72 20 70 | 75 74 20 70 65 72 6d 61 |hbufer p|ut perma|
|00000f10| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 74 5d 20 34 29 |nent-loc|al t] 4)|
|00000f20| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00000f30| 66 2d 67 65 74 2d 67 72 | 6f 75 70 2d 62 75 66 66 |f-get-gr|oup-buff|
|00000f40| 65 72 20 23 5b 28 6d 65 | 74 61 2d 6c 69 73 74 29 |er #[(me|ta-list)|
|00000f50| 20 22 08 40 40 87 22 20 | 5b 6d 65 74 61 2d 6c 69 | ".@@." |[meta-li|
|00000f60| 73 74 5d 20 31 5d 29 0a | 28 64 65 66 61 6c 69 61 |st] 1]).|(defalia|
|00000f70| 73 20 27 65 64 69 66 66 | 2d 67 65 74 2d 67 72 6f |s 'ediff|-get-gro|
|00000f80| 75 70 2d 72 65 67 65 78 | 70 20 23 5b 28 6d 65 74 |up-regex|p #[(met|
|00000f90| 61 2d 6c 69 73 74 29 20 | 22 08 40 41 40 87 22 20 |a-list) |".@A@." |
|00000fa0| 5b 6d 65 74 61 2d 6c 69 | 73 74 5d 20 31 5d 29 0a |[meta-li|st] 1]).|
|00000fb0| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00000fc0| 2d 67 65 74 2d 67 72 6f | 75 70 2d 6f 62 6a 41 20 |-get-gro|up-objA |
|00000fd0| 23 5b 28 6d 65 74 61 2d | 6c 69 73 74 29 20 22 c0 |#[(meta-|list) ".|
|00000fe0| 09 40 38 87 22 20 5b 32 | 20 6d 65 74 61 2d 6c 69 |.@8." [2| meta-li|
|00000ff0| 73 74 5d 20 32 5d 29 0a | 28 64 65 66 61 6c 69 61 |st] 2]).|(defalia|
|00001000| 73 20 27 65 64 69 66 66 | 2d 67 65 74 2d 67 72 6f |s 'ediff|-get-gro|
|00001010| 75 70 2d 6f 62 6a 42 20 | 23 5b 28 6d 65 74 61 2d |up-objB |#[(meta-|
|00001020| 6c 69 73 74 29 20 22 c0 | 09 40 38 87 22 20 5b 33 |list) ".|.@8." [3|
|00001030| 20 6d 65 74 61 2d 6c 69 | 73 74 5d 20 32 5d 29 0a | meta-li|st] 2]).|
|00001040| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00001050| 2d 67 65 74 2d 67 72 6f | 75 70 2d 6f 62 6a 43 20 |-get-gro|up-objC |
|00001060| 23 5b 28 6d 65 74 61 2d | 6c 69 73 74 29 20 22 c0 |#[(meta-|list) ".|
|00001070| 09 40 38 87 22 20 5b 34 | 20 6d 65 74 61 2d 6c 69 |.@8." [4| meta-li|
|00001080| 73 74 5d 20 32 5d 29 0a | 28 64 65 66 61 6c 69 61 |st] 2]).|(defalia|
|00001090| 73 20 27 65 64 69 66 66 | 2d 67 65 74 2d 73 65 73 |s 'ediff|-get-ses|
|000010a0| 73 69 6f 6e 2d 62 75 66 | 66 65 72 20 23 5b 28 65 |sion-buf|fer #[(e|
|000010b0| 6c 74 29 20 22 08 40 87 | 22 20 5b 65 6c 74 5d 20 |lt) ".@.|" [elt] |
|000010c0| 31 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |1]).(def|alias 'e|
|000010d0| 64 69 66 66 2d 67 65 74 | 2d 73 65 73 73 69 6f 6e |diff-get|-session|
|000010e0| 2d 73 74 61 74 75 73 20 | 23 5b 28 65 6c 74 29 20 |-status |#[(elt) |
|000010f0| 22 08 41 40 87 22 20 5b | 65 6c 74 5d 20 31 5d 29 |".A@." [|elt] 1])|
|00001100| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00001110| 66 2d 73 65 74 2d 73 65 | 73 73 69 6f 6e 2d 73 74 |f-set-se|ssion-st|
|00001120| 61 74 75 73 20 23 5b 28 | 73 65 73 73 69 6f 6e 2d |atus #[(|session-|
|00001130| 69 6e 66 6f 20 6e 65 77 | 2d 73 74 61 74 75 73 29 |info new|-status)|
|00001140| 20 22 08 41 09 a0 87 22 | 20 5b 73 65 73 73 69 6f | ".A..."| [sessio|
|00001150| 6e 2d 69 6e 66 6f 20 6e | 65 77 2d 73 74 61 74 75 |n-info n|ew-statu|
|00001160| 73 5d 20 32 5d 29 0a 28 | 64 65 66 61 6c 69 61 73 |s] 2]).(|defalias|
|00001170| 20 27 65 64 69 66 66 2d | 67 65 74 2d 73 65 73 73 | 'ediff-|get-sess|
|00001180| 69 6f 6e 2d 6f 62 6a 41 | 20 23 5b 28 65 6c 74 29 |ion-objA| #[(elt)|
|00001190| 20 22 c0 09 38 87 22 20 | 5b 32 20 65 6c 74 5d 20 | "..8." |[2 elt] |
|000011a0| 32 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |2]).(def|alias 'e|
|000011b0| 64 69 66 66 2d 67 65 74 | 2d 73 65 73 73 69 6f 6e |diff-get|-session|
|000011c0| 2d 6f 62 6a 42 20 23 5b | 28 65 6c 74 29 20 22 c0 |-objB #[|(elt) ".|
|000011d0| 09 38 87 22 20 5b 33 20 | 65 6c 74 5d 20 32 5d 29 |.8." [3 |elt] 2])|
|000011e0| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|000011f0| 66 2d 67 65 74 2d 73 65 | 73 73 69 6f 6e 2d 6f 62 |f-get-se|ssion-ob|
|00001200| 6a 43 20 23 5b 28 65 6c | 74 29 20 22 c0 09 38 87 |jC #[(el|t) "..8.|
|00001210| 22 20 5b 34 20 65 6c 74 | 5d 20 32 5d 29 0a 28 64 |" [4 elt|] 2]).(d|
|00001220| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 67 |efalias |'ediff-g|
|00001230| 65 74 2d 73 65 73 73 69 | 6f 6e 2d 6f 62 6a 41 2d |et-sessi|on-objA-|
|00001240| 6e 61 6d 65 20 23 5b 28 | 65 6c 74 29 20 22 c0 09 |name #[(|elt) "..|
|00001250| 38 40 87 22 20 5b 32 20 | 65 6c 74 5d 20 32 5d 29 |8@." [2 |elt] 2])|
|00001260| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00001270| 66 2d 67 65 74 2d 73 65 | 73 73 69 6f 6e 2d 6f 62 |f-get-se|ssion-ob|
|00001280| 6a 42 2d 6e 61 6d 65 20 | 23 5b 28 65 6c 74 29 20 |jB-name |#[(elt) |
|00001290| 22 c0 09 38 40 87 22 20 | 5b 33 20 65 6c 74 5d 20 |"..8@." |[3 elt] |
|000012a0| 32 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |2]).(def|alias 'e|
|000012b0| 64 69 66 66 2d 67 65 74 | 2d 73 65 73 73 69 6f 6e |diff-get|-session|
|000012c0| 2d 6f 62 6a 43 2d 6e 61 | 6d 65 20 23 5b 28 65 6c |-objC-na|me #[(el|
|000012d0| 74 29 20 22 c0 09 38 40 | 87 22 20 5b 34 20 65 6c |t) "..8@|." [4 el|
|000012e0| 74 5d 20 32 5d 29 0a 28 | 64 65 66 61 6c 69 61 73 |t] 2]).(|defalias|
|000012f0| 20 27 65 64 69 66 66 2d | 67 65 74 2d 66 69 6c 65 | 'ediff-|get-file|
|00001300| 2d 65 71 73 74 61 74 75 | 73 20 23 5b 28 65 6c 74 |-eqstatu|s #[(elt|
|00001310| 29 20 22 08 41 40 87 22 | 20 5b 65 6c 74 5d 20 31 |) ".A@."| [elt] 1|
|00001320| 5d 29 0a 28 70 75 74 20 | 28 71 75 6f 74 65 20 65 |]).(put |(quote e|
|00001330| 64 69 66 66 2d 67 65 74 | 2d 66 69 6c 65 2d 65 71 |diff-get|-file-eq|
|00001340| 73 74 61 74 75 73 29 20 | 28 71 75 6f 74 65 20 62 |status) |(quote b|
|00001350| 79 74 65 2d 6f 70 74 69 | 6d 69 7a 65 72 29 20 28 |yte-opti|mizer) (|
|00001360| 71 75 6f 74 65 20 62 79 | 74 65 2d 63 6f 6d 70 69 |quote by|te-compi|
|00001370| 6c 65 2d 69 6e 6c 69 6e | 65 2d 65 78 70 61 6e 64 |le-inlin|e-expand|
|00001380| 29 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |)).(defa|lias 'ed|
|00001390| 69 66 66 2d 73 65 74 2d | 66 69 6c 65 2d 65 71 73 |iff-set-|file-eqs|
|000013a0| 74 61 74 75 73 20 23 5b | 28 65 6c 74 20 76 61 6c |tatus #[|(elt val|
|000013b0| 75 65 29 20 22 08 41 09 | a0 87 22 20 5b 65 6c 74 |ue) ".A.|.." [elt|
|000013c0| 20 76 61 6c 75 65 5d 20 | 32 5d 29 0a 28 70 75 74 | value] |2]).(put|
|000013d0| 20 28 71 75 6f 74 65 20 | 65 64 69 66 66 2d 73 65 | (quote |ediff-se|
|000013e0| 74 2d 66 69 6c 65 2d 65 | 71 73 74 61 74 75 73 29 |t-file-e|qstatus)|
|000013f0| 20 28 71 75 6f 74 65 20 | 62 79 74 65 2d 6f 70 74 | (quote |byte-opt|
|00001400| 69 6d 69 7a 65 72 29 20 | 28 71 75 6f 74 65 20 62 |imizer) |(quote b|
|00001410| 79 74 65 2d 63 6f 6d 70 | 69 6c 65 2d 69 6e 6c 69 |yte-comp|ile-inli|
|00001420| 6e 65 2d 65 78 70 61 6e | 64 29 29 0a 28 64 65 66 |ne-expan|d)).(def|
|00001430| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 73 65 74 |alias 'e|diff-set|
|00001440| 75 70 2d 6d 65 74 61 2d | 6d 61 70 20 23 5b 6e 69 |up-meta-|map #[ni|
|00001450| 6c 20 22 c0 20 11 c2 09 | 21 88 c3 09 c4 c5 23 88 |l ". ...|!.....#.|
|00001460| c3 09 c6 c7 23 88 c3 09 | c8 c9 23 88 c3 09 ca 0e |....#...|..#.....|
|00001470| 0b 23 88 c3 09 cc 0e 0b | 23 88 c3 09 cd ce 23 88 |.#......|#.....#.|
|00001480| c3 09 cf d0 23 88 c3 09 | d1 d0 23 88 c3 09 d2 d0 |....#...|..#.....|
|00001490| 23 88 d3 20 84 4a 00 c3 | 09 d4 d5 23 88 0e 16 83 |#.. .J..|...#....|
|000014a0| 55 00 c3 09 d7 d0 23 88 | 0e 18 83 64 00 c3 09 d9 |U.....#.|...d....|
|000014b0| 0e 0b 23 88 82 6b 00 c3 | 09 da 0e 0b 23 88 db 09 |..#..k..|....#...|
|000014c0| 21 87 22 20 5b 6d 61 6b | 65 2d 73 70 61 72 73 65 |!." [mak|e-sparse|
|000014d0| 2d 6b 65 79 6d 61 70 20 | 65 64 69 66 66 2d 6d 65 |-keymap |ediff-me|
|000014e0| 74 61 2d 62 75 66 66 65 | 72 2d 6d 61 70 20 73 75 |ta-buffe|r-map su|
|000014f0| 70 70 72 65 73 73 2d 6b | 65 79 6d 61 70 20 64 65 |ppress-k|eymap de|
|00001500| 66 69 6e 65 2d 6b 65 79 | 20 22 71 22 20 65 64 69 |fine-key| "q" edi|
|00001510| 66 66 2d 71 75 69 74 2d | 6d 65 74 61 2d 62 75 66 |ff-quit-|meta-buf|
|00001520| 66 65 72 20 22 52 22 20 | 65 64 69 66 66 2d 73 68 |fer "R" |ediff-sh|
|00001530| 6f 77 2d 72 65 67 69 73 | 74 72 79 20 22 45 22 20 |ow-regis|try "E" |
|00001540| 65 64 69 66 66 2d 64 6f | 63 75 6d 65 6e 74 61 74 |ediff-do|cumentat|
|00001550| 69 6f 6e 20 22 76 22 20 | 65 64 69 66 66 2d 6d 65 |ion "v" |ediff-me|
|00001560| 74 61 2d 61 63 74 69 6f | 6e 2d 66 75 6e 63 74 69 |ta-actio|n-functi|
|00001570| 6f 6e 20 22 0d 22 20 22 | 20 22 20 65 64 69 66 66 |on "." "| " ediff|
|00001580| 2d 6e 65 78 74 2d 6d 65 | 74 61 2d 69 74 65 6d 20 |-next-me|ta-item |
|00001590| 22 7f 22 20 65 64 69 66 | 66 2d 70 72 65 76 69 6f |"." edif|f-previo|
|000015a0| 75 73 2d 6d 65 74 61 2d | 69 74 65 6d 20 5b 64 65 |us-meta-|item [de|
|000015b0| 6c 65 74 65 5d 20 5b 62 | 61 63 6b 73 70 61 63 65 |lete] [b|ackspace|
|000015c0| 5d 20 65 64 69 66 66 2d | 6f 6e 65 2d 66 69 6c 65 |] ediff-|one-file|
|000015d0| 67 72 6f 75 70 2d 6d 65 | 74 61 6a 6f 62 20 22 3d |group-me|tajob "=|
|000015e0| 22 20 65 64 69 66 66 2d | 6d 65 74 61 2d 6d 61 72 |" ediff-|meta-mar|
|000015f0| 6b 2d 65 71 75 61 6c 2d | 66 69 6c 65 73 20 65 64 |k-equal-|files ed|
|00001600| 69 66 66 2d 6e 6f 2d 65 | 6d 61 63 73 2d 68 65 6c |iff-no-e|macs-hel|
|00001610| 70 2d 69 6e 2d 63 6f 6e | 74 72 6f 6c 2d 62 75 66 |p-in-con|trol-buf|
|00001620| 66 65 72 20 22 08 22 20 | 65 64 69 66 66 2d 65 6d |fer "." |ediff-em|
|00001630| 61 63 73 2d 70 20 5b 6d | 6f 75 73 65 2d 32 5d 20 |acs-p [m|ouse-2] |
|00001640| 5b 62 75 74 74 6f 6e 32 | 5d 20 75 73 65 2d 6c 6f |[button2|] use-lo|
|00001650| 63 61 6c 2d 6d 61 70 5d | 20 34 5d 29 0a 23 40 35 |cal-map]| 4]).#@5|
|00001660| 31 36 20 54 68 69 73 20 | 6d 6f 64 65 20 63 6f 6e |16 This |mode con|
|00001670| 74 72 6f 6c 73 20 61 6c | 6c 20 6f 70 65 72 61 74 |trols al|l operat|
|00001680| 69 6f 6e 73 20 6f 6e 20 | 45 64 69 66 66 20 73 65 |ions on |Ediff se|
|00001690| 73 73 69 6f 6e 20 67 72 | 6f 75 70 73 2e 0a 49 74 |ssion gr|oups..It|
|000016a0| 20 69 73 20 65 6e 74 65 | 72 65 64 20 74 68 72 6f | is ente|red thro|
|000016b0| 75 67 68 20 6f 6e 65 20 | 6f 66 20 74 68 65 20 66 |ugh one |of the f|
|000016c0| 6f 6c 6c 6f 77 69 6e 67 | 20 63 6f 6d 6d 61 6e 64 |ollowing| command|
|000016d0| 73 3a 0a 09 60 65 64 69 | 66 66 2d 64 69 72 65 63 |s:..`edi|ff-direc|
|000016e0| 74 6f 72 69 65 73 27 0a | 09 60 65 64 69 72 73 27 |tories'.|.`edirs'|
|000016f0| 0a 09 60 65 64 69 66 66 | 2d 64 69 72 65 63 74 6f |..`ediff|-directo|
|00001700| 72 69 65 73 33 27 0a 09 | 60 65 64 69 72 73 33 27 |ries3'..|`edirs3'|
|00001710| 0a 09 60 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 64 |..`ediff|-merge-d|
|00001720| 69 72 65 63 74 6f 72 69 | 65 73 27 0a 09 60 65 64 |irectori|es'..`ed|
|00001730| 69 72 73 2d 6d 65 72 67 | 65 27 0a 09 60 65 64 69 |irs-merg|e'..`edi|
|00001740| 66 66 2d 6d 65 72 67 65 | 2d 64 69 72 65 63 74 6f |ff-merge|-directo|
|00001750| 72 69 65 73 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |ries-wit|h-ancest|
|00001760| 6f 72 27 0a 09 60 65 64 | 69 72 73 2d 6d 65 72 67 |or'..`ed|irs-merg|
|00001770| 65 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 27 |e-with-a|ncestor'|
|00001780| 0a 09 60 65 64 69 66 66 | 2d 64 69 72 65 63 74 6f |..`ediff|-directo|
|00001790| 72 79 2d 72 65 76 69 73 | 69 6f 6e 73 27 0a 09 60 |ry-revis|ions'..`|
|000017a0| 65 64 69 72 2d 72 65 76 | 69 73 69 6f 6e 73 27 0a |edir-rev|isions'.|
|000017b0| 09 60 65 64 69 66 66 2d | 6d 65 72 67 65 2d 64 69 |.`ediff-|merge-di|
|000017c0| 72 65 63 74 6f 72 79 2d | 72 65 76 69 73 69 6f 6e |rectory-|revision|
|000017d0| 73 27 0a 09 60 65 64 69 | 72 2d 6d 65 72 67 65 2d |s'..`edi|r-merge-|
|000017e0| 72 65 76 69 73 69 6f 6e | 73 27 0a 09 60 65 64 69 |revision|s'..`edi|
|000017f0| 66 66 2d 6d 65 72 67 65 | 2d 64 69 72 65 63 74 6f |ff-merge|-directo|
|00001800| 72 79 2d 72 65 76 69 73 | 69 6f 6e 73 2d 77 69 74 |ry-revis|ions-wit|
|00001810| 68 2d 61 6e 63 65 73 74 | 6f 72 27 0a 09 60 65 64 |h-ancest|or'..`ed|
|00001820| 69 72 2d 6d 65 72 67 65 | 2d 72 65 76 69 73 69 6f |ir-merge|-revisio|
|00001830| 6e 73 2d 77 69 74 68 2d | 61 6e 63 65 73 74 6f 72 |ns-with-|ancestor|
|00001840| 27 0a 0a 43 6f 6d 6d 61 | 6e 64 73 3a 0a 5c 7b 65 |'..Comma|nds:.\{e|
|00001850| 64 69 66 66 2d 6d 65 74 | 61 2d 62 75 66 66 65 72 |diff-met|a-buffer|
|00001860| 2d 6d 61 70 7d 1f 0a 28 | 64 65 66 61 6c 69 61 73 |-map}..(|defalias|
|00001870| 20 27 65 64 69 66 66 2d | 6d 65 74 61 2d 6d 6f 64 | 'ediff-|meta-mod|
|00001880| 65 20 23 5b 6e 69 6c 20 | 22 c0 20 88 c1 12 c3 89 |e #[nil |". .....|
|00001890| 14 87 22 20 5b 6b 69 6c | 6c 2d 61 6c 6c 2d 6c 6f |.." [kil|l-all-lo|
|000018a0| 63 61 6c 2d 76 61 72 69 | 61 62 6c 65 73 20 65 64 |cal-vari|ables ed|
|000018b0| 69 66 66 2d 6d 65 74 61 | 2d 6d 6f 64 65 20 6d 61 |iff-meta|-mode ma|
|000018c0| 6a 6f 72 2d 6d 6f 64 65 | 20 22 4d 65 74 61 45 64 |jor-mode| "MetaEd|
|000018d0| 69 66 66 22 20 6d 6f 64 | 65 2d 6e 61 6d 65 5d 20 |iff" mod|e-name] |
|000018e0| 32 20 28 23 24 20 2e 20 | 35 37 33 31 29 5d 29 0a |2 (#$ . |5731)]).|
|000018f0| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 09 21 88 |(byte-co|de "..!.|
|00001900| c2 09 c3 c4 23 88 c2 09 | c5 c6 23 88 c2 09 c7 c8 |....#...|..#.....|
|00001910| 23 88 c2 09 c9 c8 23 88 | c2 09 ca c8 23 87 22 20 |#.....#.|....#." |
|00001920| 5b 73 75 70 70 72 65 73 | 73 2d 6b 65 79 6d 61 70 |[suppres|s-keymap|
|00001930| 20 65 64 69 66 66 2d 64 | 69 72 2d 64 69 66 66 73 | ediff-d|ir-diffs|
|00001940| 2d 62 75 66 66 65 72 2d | 6d 61 70 20 64 65 66 69 |-buffer-|map defi|
|00001950| 6e 65 2d 6b 65 79 20 22 | 71 22 20 65 64 69 66 66 |ne-key "|q" ediff|
|00001960| 2d 62 75 72 79 2d 64 69 | 72 2d 64 69 66 66 73 2d |-bury-di|r-diffs-|
|00001970| 62 75 66 66 65 72 20 22 | 20 22 20 6e 65 78 74 2d |buffer "| " next-|
|00001980| 6c 69 6e 65 20 22 7f 22 | 20 70 72 65 76 69 6f 75 |line "."| previou|
|00001990| 73 2d 6c 69 6e 65 20 5b | 64 65 6c 65 74 65 5d 20 |s-line [|delete] |
|000019a0| 5b 62 61 63 6b 73 70 61 | 63 65 5d 5d 20 34 29 0a |[backspa|ce]] 4).|
|000019b0| 23 40 31 34 30 20 4d 6f | 76 65 20 74 6f 20 74 68 |#@140 Mo|ve to th|
|000019c0| 65 20 6e 65 78 74 20 69 | 74 65 6d 20 69 6e 20 45 |e next i|tem in E|
|000019d0| 64 69 66 66 20 72 65 67 | 69 73 74 72 79 20 6f 72 |diff reg|istry or|
|000019e0| 20 73 65 73 73 69 6f 6e | 20 67 72 6f 75 70 20 62 | session| group b|
|000019f0| 75 66 66 65 72 2e 0a 4d | 6f 76 65 73 20 69 6e 20 |uffer..M|oves in |
|00001a00| 63 69 72 63 75 6c 61 72 | 20 66 61 73 68 69 6f 6e |circular| fashion|
|00001a10| 2e 20 57 69 74 68 20 6e | 75 6d 65 72 69 63 20 70 |. With n|umeric p|
|00001a20| 72 65 66 69 78 20 61 72 | 67 2c 20 73 6b 69 70 20 |refix ar|g, skip |
|00001a30| 74 68 69 73 20 6d 61 6e | 79 20 69 74 65 6d 73 2e |this man|y items.|
|00001a40| 1f 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |..(defal|ias 'edi|
|00001a50| 66 66 2d 6e 65 78 74 2d | 6d 65 74 61 2d 69 74 65 |ff-next-|meta-ite|
|00001a60| 6d 20 23 5b 28 63 6f 75 | 6e 74 29 20 22 08 84 06 |m #[(cou|nt) "...|
|00001a70| 00 c1 10 c2 08 57 85 15 | 00 08 53 10 c3 20 88 82 |.....W..|..S.. ..|
|00001a80| 06 00 87 22 20 5b 63 6f | 75 6e 74 20 31 20 30 20 |..." [co|unt 1 0 |
|00001a90| 65 64 69 66 66 2d 6e 65 | 78 74 2d 6d 65 74 61 2d |ediff-ne|xt-meta-|
|00001aa0| 69 74 65 6d 31 5d 20 32 | 20 28 23 24 20 2e 20 36 |item1] 2| (#$ . 6|
|00001ab0| 35 38 32 29 20 22 70 22 | 5d 29 0a 28 64 65 66 61 |582) "p"|]).(defa|
|00001ac0| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 6e 65 78 74 |lias 'ed|iff-next|
|00001ad0| 2d 6d 65 74 61 2d 69 74 | 65 6d 31 20 23 5b 6e 69 |-meta-it|em1 #[ni|
|00001ae0| 6c 20 22 c0 19 c2 60 21 | 89 11 83 0d 00 09 62 88 |l "...`!|......b.|
|00001af0| 0b c4 3d 83 29 00 c5 70 | 09 c6 23 85 34 00 c7 c8 |..=.)..p|..#.4...|
|00001b00| c0 c9 23 85 34 00 ca c0 | 78 82 34 00 cb c0 77 cc |..#.4...|x.4...w.|
|00001b10| 56 85 34 00 cd ce 21 29 | 87 22 20 5b 6e 69 6c 20 |V.4...!)|." [nil |
|00001b20| 70 6f 73 20 65 64 69 66 | 66 2d 6e 65 78 74 2d 6d |pos edif|f-next-m|
|00001b30| 65 74 61 2d 6f 76 65 72 | 6c 61 79 2d 73 74 61 72 |eta-over|lay-star|
|00001b40| 74 20 65 64 69 66 66 2d | 6d 65 74 61 6a 6f 62 2d |t ediff-|metajob-|
|00001b50| 6e 61 6d 65 20 65 64 69 | 66 66 2d 72 65 67 69 73 |name edi|ff-regis|
|00001b60| 74 72 79 20 65 64 69 66 | 66 2d 67 65 74 2d 6d 65 |try edif|f-get-me|
|00001b70| 74 61 2d 69 6e 66 6f 20 | 6e 6f 65 72 72 6f 72 20 |ta-info |noerror |
|00001b80| 73 65 61 72 63 68 2d 66 | 6f 72 77 61 72 64 20 22 |search-f|orward "|
|00001b90| 2a 45 64 69 66 66 22 20 | 74 20 22 61 2d 7a 41 2d |*Ediff" |t "a-zA-|
|00001ba0| 5a 2a 22 20 22 2d 2b 3f | 48 2a 20 09 30 2d 39 22 |Z*" "-+?|H* .0-9"|
|00001bb0| 20 30 20 62 61 63 6b 77 | 61 72 64 2d 63 68 61 72 | 0 backw|ard-char|
|00001bc0| 20 31 5d 20 35 5d 29 0a | 23 40 31 34 34 20 4d 6f | 1] 5]).|#@144 Mo|
|00001bd0| 76 65 20 74 6f 20 74 68 | 65 20 70 72 65 76 69 6f |ve to th|e previo|
|00001be0| 75 73 20 69 74 65 6d 20 | 69 6e 20 45 64 69 66 66 |us item |in Ediff|
|00001bf0| 20 72 65 67 69 73 74 72 | 79 20 6f 72 20 73 65 73 | registr|y or ses|
|00001c00| 73 69 6f 6e 20 67 72 6f | 75 70 20 62 75 66 66 65 |sion gro|up buffe|
|00001c10| 72 2e 0a 4d 6f 76 65 73 | 20 69 6e 20 63 69 72 63 |r..Moves| in circ|
|00001c20| 75 6c 61 72 20 66 61 73 | 68 69 6f 6e 2e 20 57 69 |ular fas|hion. Wi|
|00001c30| 74 68 20 6e 75 6d 65 72 | 69 63 20 70 72 65 66 69 |th numer|ic prefi|
|00001c40| 78 20 61 72 67 2c 20 73 | 6b 69 70 20 74 68 69 73 |x arg, s|kip this|
|00001c50| 20 6d 61 6e 79 20 69 74 | 65 6d 73 2e 1f 0a 28 64 | many it|ems...(d|
|00001c60| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 70 |efalias |'ediff-p|
|00001c70| 72 65 76 69 6f 75 73 2d | 6d 65 74 61 2d 69 74 65 |revious-|meta-ite|
|00001c80| 6d 20 23 5b 28 63 6f 75 | 6e 74 29 20 22 08 84 06 |m #[(cou|nt) "...|
|00001c90| 00 c1 10 c2 08 57 85 15 | 00 08 53 10 c3 20 88 82 |.....W..|..S.. ..|
|00001ca0| 06 00 87 22 20 5b 63 6f | 75 6e 74 20 31 20 30 20 |..." [co|unt 1 0 |
|00001cb0| 65 64 69 66 66 2d 70 72 | 65 76 69 6f 75 73 2d 6d |ediff-pr|evious-m|
|00001cc0| 65 74 61 2d 69 74 65 6d | 31 5d 20 32 20 28 23 24 |eta-item|1] 2 (#$|
|00001cd0| 20 2e 20 37 31 31 38 29 | 20 22 70 22 5d 29 0a 28 | . 7118)| "p"]).(|
|00001ce0| 64 65 66 61 6c 69 61 73 | 20 27 65 64 69 66 66 2d |defalias| 'ediff-|
|00001cf0| 70 72 65 76 69 6f 75 73 | 2d 6d 65 74 61 2d 69 74 |previous|-meta-it|
|00001d00| 65 6d 31 20 23 5b 6e 69 | 6c 20 22 c0 19 c2 60 21 |em1 #[ni|l "...`!|
|00001d10| 89 11 83 0d 00 09 62 88 | 0b c4 3d 83 29 00 c5 70 |......b.|..=.)..p|
|00001d20| 09 c6 23 85 34 00 c7 c8 | c0 c9 23 85 34 00 ca c0 |..#.4...|..#.4...|
|00001d30| 78 82 34 00 cb c0 77 cc | 56 85 34 00 cd ce 21 29 |x.4...w.|V.4...!)|
|00001d40| 87 22 20 5b 6e 69 6c 20 | 70 6f 73 20 65 64 69 66 |." [nil |pos edif|
|00001d50| 66 2d 70 72 65 76 69 6f | 75 73 2d 6d 65 74 61 2d |f-previo|us-meta-|
|00001d60| 6f 76 65 72 6c 61 79 2d | 73 74 61 72 74 20 65 64 |overlay-|start ed|
|00001d70| 69 66 66 2d 6d 65 74 61 | 6a 6f 62 2d 6e 61 6d 65 |iff-meta|job-name|
|00001d80| 20 65 64 69 66 66 2d 72 | 65 67 69 73 74 72 79 20 | ediff-r|egistry |
|00001d90| 65 64 69 66 66 2d 67 65 | 74 2d 6d 65 74 61 2d 69 |ediff-ge|t-meta-i|
|00001da0| 6e 66 6f 20 6e 6f 65 72 | 72 6f 72 20 73 65 61 72 |nfo noer|ror sear|
|00001db0| 63 68 2d 66 6f 72 77 61 | 72 64 20 22 2a 45 64 69 |ch-forwa|rd "*Edi|
|00001dc0| 66 66 22 20 74 20 22 61 | 2d 7a 41 2d 5a 2a 22 20 |ff" t "a|-zA-Z*" |
|00001dd0| 22 2d 2b 3f 48 2a 20 09 | 30 2d 39 22 20 30 20 62 |"-+?H* .|0-9" 0 b|
|00001de0| 61 63 6b 77 61 72 64 2d | 63 68 61 72 20 31 5d 20 |ackward-|char 1] |
|00001df0| 35 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |5]).(def|alias 'e|
|00001e00| 64 69 66 66 2d 69 6e 74 | 65 72 73 65 63 74 2d 64 |diff-int|ersect-d|
|00001e10| 69 72 65 63 74 6f 72 69 | 65 73 20 23 5b 28 6a 6f |irectori|es #[(jo|
|00001e20| 62 6e 61 6d 65 20 64 69 | 66 66 2d 76 61 72 20 72 |bname di|ff-var r|
|00001e30| 65 67 65 78 70 20 64 69 | 72 31 20 64 69 72 32 20 |egexp di|r1 dir2 |
|00001e40| 26 6f 70 74 69 6f 6e 61 | 6c 20 64 69 72 33 20 63 |&optiona|l dir3 c|
|00001e50| 6f 6d 70 61 72 69 73 6f | 6e 2d 66 75 6e 63 29 20 |ompariso|n-func) |
|00001e60| 22 08 86 05 00 c1 10 c2 | 89 89 89 89 89 89 89 1b |".......|........|
|00001e70| 1c 1d 1e 06 1e 07 1e 08 | 1e 09 1e 5c 6e cb 0e 5c |........|...\n..\|
|00001e80| 66 21 16 06 cd 0e 06 c2 | 0e 0e 23 16 5c 6e cb 0e |f!......|..#.\n..|
|00001e90| 0f 21 15 cd 0d c2 0e 0e | 23 16 09 0e 10 3b 83 4a |.!......|#....;.J|
|00001ea0| 00 cb 0e 10 21 14 cd 5c | 66 c2 0e 0e 23 16 08 d1 |....!..\|f...#...|
|00001eb0| d2 0e 5c 6e 5c 22 16 5c | 6e d1 d3 0e 5c 6e 5c 22 |..\n\".\|n...\n\"|
|00001ec0| 16 5c 6e d4 0e 5c 6e 0e | 09 08 23 16 07 d5 d6 0e |.\n..\n.|..#.....|
|00001ed0| 07 5c 22 88 0e 08 83 75 | 00 d4 0e 07 0e 08 08 23 |.\"....u|.......#|
|00001ee0| 16 07 0e 17 89 1e 18 86 | 7f 00 0e 19 da 3e 29 83 |........|.....>).|
|00001ef0| 8b 00 d5 db 0e 07 5c 22 | 88 dc dd 0e 07 21 de 5c |......\"|.....!.\|
|00001f00| 22 16 07 df e0 89 0e 5c | 6e 0e 09 08 23 0e 08 08 |"......\|n...#...|
|00001f10| 23 0e 07 08 23 13 d1 d2 | 0b 5c 22 13 dc dd d1 d3 |#...#...|.\".....|
|00001f20| 0b 5c 22 21 de 5c 22 13 | d5 e1 0b 5c 22 13 d5 e2 |.\"!.\".|...\"...|
|00001f30| 0b 5c 22 88 0e 0e 0e 06 | 0d 5c 66 46 0b 42 13 0e |.\".....|.\fF.B..|
|00001f40| 23 0b 4c 88 0e 0e 0e 06 | 0d 5c 66 46 d5 e4 0e 07 |#.L.....|.\fF....|
|00001f50| 5c 22 2e 08 42 87 22 20 | 5b 63 6f 6d 70 61 72 69 |\"..B." |[compari|
|00001f60| 73 6f 6e 2d 66 75 6e 63 | 20 73 74 72 69 6e 67 3d |son-func| string=|
|00001f70| 20 6e 69 6c 20 64 69 66 | 66 6c 69 73 74 20 61 75 | nil dif|flist au|
|00001f80| 78 64 69 72 33 20 61 75 | 78 64 69 72 32 20 61 75 |xdir3 au|xdir2 au|
|00001f90| 78 64 69 72 31 20 63 6f | 6d 6d 6f 6e 20 6c 69 73 |xdir1 co|mmon lis|
|00001fa0| 33 20 6c 69 73 32 20 6c | 69 73 31 20 66 69 6c 65 |3 lis2 l|is1 file|
|00001fb0| 2d 6e 61 6d 65 2d 61 73 | 2d 64 69 72 65 63 74 6f |-name-as|-directo|
|00001fc0| 72 79 20 64 69 72 31 20 | 64 69 72 65 63 74 6f 72 |ry dir1 |director|
|00001fd0| 79 2d 66 69 6c 65 73 20 | 72 65 67 65 78 70 20 64 |y-files |regexp d|
|00001fe0| 69 72 32 20 64 69 72 33 | 20 64 65 6c 65 74 65 20 |ir2 dir3| delete |
|00001ff0| 22 2e 22 20 22 2e 2e 22 | 20 65 64 69 66 66 2d 69 |"." ".."| ediff-i|
|00002000| 6e 74 65 72 73 65 63 74 | 69 6f 6e 20 6d 61 70 63 |ntersect|ion mapc|
|00002010| 61 72 20 23 5b 28 65 6c | 74 29 20 22 c0 09 5c 6e |ar #[(el|t) "..\n|
|00002020| 50 21 c0 0b 5c 6e 50 21 | 1c 89 1d 83 15 00 5c 66 |P!..\nP!|......\f|
|00002030| 3f 86 1b 00 0d 3f 85 1b | 00 5c 66 2a 85 27 00 c6 |?....?..|.\f*.'..|
|00002040| 5c 6e 0e 07 5c 22 89 16 | 07 87 22 20 5b 66 69 6c |\n..\"..|.." [fil|
|00002050| 65 2d 64 69 72 65 63 74 | 6f 72 79 2d 70 20 61 75 |e-direct|ory-p au|
|00002060| 78 64 69 72 31 20 65 6c | 74 20 61 75 78 64 69 72 |xdir1 el|t auxdir|
|00002070| 32 20 62 20 61 20 64 65 | 6c 71 20 63 6f 6d 6d 6f |2 b a de|lq commo|
|00002080| 6e 5d 20 35 5d 20 6a 6f | 62 6e 61 6d 65 20 6d 65 |n] 5] jo|bname me|
|00002090| 74 61 6a 6f 62 20 65 64 | 69 66 66 2d 6d 65 74 61 |tajob ed|iff-meta|
|000020a0| 6a 6f 62 2d 6e 61 6d 65 | 20 28 65 64 69 66 66 2d |job-name| (ediff-|
|000020b0| 64 69 72 65 63 74 6f 72 | 69 65 73 33 20 65 64 69 |director|ies3 edi|
|000020c0| 66 66 2d 66 69 6c 65 67 | 72 6f 75 70 73 33 29 20 |ff-fileg|roups3) |
|000020d0| 23 5b 28 65 6c 74 29 20 | 22 c0 09 5c 6e 50 21 c0 |#[(elt) |"..\nP!.|
|000020e0| 0b 5c 6e 50 21 1c 89 1d | 83 15 00 5c 66 3f 86 1b |.\nP!...|...\f?..|
|000020f0| 00 0d 3f 85 1b 00 5c 66 | 2a 85 27 00 c6 5c 6e 0e |..?...\f|*.'..\n.|
|00002100| 07 5c 22 89 16 07 87 22 | 20 5b 66 69 6c 65 2d 64 |.\"...."| [file-d|
|00002110| 69 72 65 63 74 6f 72 79 | 2d 70 20 61 75 78 64 69 |irectory|-p auxdi|
|00002120| 72 31 20 65 6c 74 20 61 | 75 78 64 69 72 33 20 62 |r1 elt a|uxdir3 b|
|00002130| 20 61 20 64 65 6c 71 20 | 63 6f 6d 6d 6f 6e 5d 20 | a delq |common] |
|00002140| 35 5d 20 73 6f 72 74 20 | 65 64 69 66 66 2d 63 6f |5] sort |ediff-co|
|00002150| 70 79 2d 6c 69 73 74 20 | 73 74 72 69 6e 67 2d 6c |py-list |string-l|
|00002160| 65 73 73 70 20 65 64 69 | 66 66 2d 73 65 74 2d 64 |essp edi|ff-set-d|
|00002170| 69 66 66 65 72 65 6e 63 | 65 20 65 64 69 66 66 2d |ifferenc|e ediff-|
|00002180| 75 6e 69 6f 6e 20 23 5b | 28 65 6c 74 29 20 22 08 |union #[|(elt) ".|
|00002190| c1 42 87 22 20 5b 65 6c | 74 20 31 5d 20 32 5d 20 |.B." [el|t 1] 2] |
|000021a0| 23 5b 28 65 6c 74 29 20 | 22 08 40 09 9d 83 0e 00 |#[(elt) |".@.....|
|000021b0| 08 89 41 c2 5f a1 88 08 | 40 0b 9d 83 1c 00 08 89 |..A._...|@.......|
|000021c0| 41 c4 5f a1 88 08 40 0d | 9d 85 29 00 08 89 41 c6 |A._...@.|..)...A.|
|000021d0| 5f a1 87 22 20 5b 65 6c | 74 20 6c 69 73 31 20 32 |_.." [el|t lis1 2|
|000021e0| 20 6c 69 73 32 20 33 20 | 6c 69 73 33 20 35 5d 20 | lis2 3 |lis3 5] |
|000021f0| 33 5d 20 64 69 66 66 2d | 76 61 72 20 23 5b 28 65 |3] diff-|var #[(e|
|00002200| 6c 74 29 20 22 08 09 50 | 5c 6e 09 50 0b 85 0d 00 |lt) "..P|\n.P....|
|00002210| 5c 66 09 50 45 87 22 20 | 5b 61 75 78 64 69 72 31 |\f.PE." |[auxdir1|
|00002220| 20 65 6c 74 20 61 75 78 | 64 69 72 32 20 6c 69 73 | elt aux|dir2 lis|
|00002230| 33 20 61 75 78 64 69 72 | 33 5d 20 34 5d 5d 20 39 |3 auxdir|3] 4]] 9|
|00002240| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00002250| 69 66 66 2d 67 65 74 2d | 64 69 72 65 63 74 6f 72 |iff-get-|director|
|00002260| 79 2d 66 69 6c 65 73 2d | 75 6e 64 65 72 2d 72 65 |y-files-|under-re|
|00002270| 76 69 73 69 6f 6e 20 23 | 5b 28 6a 6f 62 6e 61 6d |vision #|[(jobnam|
|00002280| 65 20 72 65 67 65 78 70 | 20 64 69 72 31 29 20 22 |e regexp| dir1) "|
|00002290| c0 89 89 89 19 1a 1b 1c | c5 0e 06 21 11 c7 09 c0 |........|...!....|
|000022a0| 0e 08 23 14 5c 66 83 4e | 00 5c 66 40 13 5c 66 41 |..#.\f.N|.\f@.\fA|
|000022b0| 14 c9 09 0b 50 21 83 2d | 00 0b 5c 6e 42 12 82 14 |....P!.-|..\nB...|
|000022c0| 00 ca 09 0b cb 51 21 83 | 3d 00 0b 5c 6e 42 12 82 |.....Q!.|=..\nB..|
|000022d0| 14 00 ca 09 cc 0b cb 52 | 21 83 14 00 0b 5c 6e 42 |.......R|!....\nB|
|000022e0| 12 82 14 00 cd ce 5c 6e | 5c 22 12 cd cf 5c 6e 5c |......\n|\"...\n\|
|000022f0| 22 12 d0 d1 5c 6e 21 d2 | 5c 22 12 0e 08 09 c0 89 |"...\n!.|\"......|
|00002300| 46 d3 d4 5c 6e 5c 22 2c | 42 87 22 20 5b 6e 69 6c |F..\n\",|B." [nil|
|00002310| 20 61 75 78 64 69 72 31 | 20 63 6f 6d 6d 6f 6e 20 | auxdir1| common |
|00002320| 65 6c 74 20 6c 69 73 31 | 20 66 69 6c 65 2d 6e 61 |elt lis1| file-na|
|00002330| 6d 65 2d 61 73 2d 64 69 | 72 65 63 74 6f 72 79 20 |me-as-di|rectory |
|00002340| 64 69 72 31 20 64 69 72 | 65 63 74 6f 72 79 2d 66 |dir1 dir|ectory-f|
|00002350| 69 6c 65 73 20 72 65 67 | 65 78 70 20 66 69 6c 65 |iles reg|exp file|
|00002360| 2d 64 69 72 65 63 74 6f | 72 79 2d 70 20 66 69 6c |-directo|ry-p fil|
|00002370| 65 2d 65 78 69 73 74 73 | 2d 70 20 22 2c 76 22 20 |e-exists|-p ",v" |
|00002380| 22 52 43 53 2f 22 20 64 | 65 6c 65 74 65 20 22 2e |"RCS/" d|elete ".|
|00002390| 22 20 22 2e 2e 22 20 73 | 6f 72 74 20 65 64 69 66 |" ".." s|ort edif|
|000023a0| 66 2d 63 6f 70 79 2d 6c | 69 73 74 20 73 74 72 69 |f-copy-l|ist stri|
|000023b0| 6e 67 2d 6c 65 73 73 70 | 20 6d 61 70 63 61 72 20 |ng-lessp| mapcar |
|000023c0| 23 5b 28 65 6c 74 29 20 | 22 08 09 50 c2 89 45 87 |#[(elt) |"..P..E.|
|000023d0| 22 20 5b 61 75 78 64 69 | 72 31 20 65 6c 74 20 6e |" [auxdi|r1 elt n|
|000023e0| 69 6c 5d 20 33 5d 5d 20 | 35 5d 29 0a 28 64 65 66 |il] 3]] |5]).(def|
|000023f0| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 70 72 65 |alias 'e|diff-pre|
|00002400| 70 61 72 65 2d 6d 65 74 | 61 2d 62 75 66 66 65 72 |pare-met|a-buffer|
|00002410| 20 23 5b 28 61 63 74 69 | 6f 6e 2d 66 75 6e 63 20 | #[(acti|on-func |
|00002420| 6d 65 74 61 2d 6c 69 73 | 74 20 6d 65 74 61 2d 62 |meta-lis|t meta-b|
|00002430| 75 66 66 65 72 2d 6e 61 | 6d 65 20 72 65 64 72 61 |uffer-na|me redra|
|00002440| 77 2d 66 75 6e 63 74 69 | 6f 6e 20 6a 6f 62 6e 61 |w-functi|on jobna|
|00002450| 6d 65 20 26 6f 70 74 69 | 6f 6e 61 6c 20 73 74 61 |me &opti|onal sta|
|00002460| 72 74 75 70 2d 68 6f 6f | 6b 73 29 20 22 c0 09 c2 |rtup-hoo|ks) "...|
|00002470| 5c 22 19 c3 09 21 1c 70 | 1d 5c 66 83 03 01 c6 5c |\"...!.p|.\f....\|
|00002480| 66 21 83 03 01 c7 c6 5c | 66 21 21 83 03 01 c8 8e |f!.....\|f!!.....|
|00002490| 5c 66 71 88 c9 20 88 0e | 5c 6e 16 0b 0e 5c 66 16 |\fq.. ..|\n...\f.|
|000024a0| 0d 0e 0e 16 0f 5c 66 16 | 10 d1 20 88 0e 0f d2 3d |.....\f.|.. ....=|
|000024b0| 83 4f 00 5c 66 16 13 0e | 14 16 15 d6 0e 17 d8 d9 |.O.\f...|........|
|000024c0| 23 88 82 5d 00 5c 66 0e | 14 40 42 da db 0e 14 41 |#..].\f.|.@B....A|
|000024d0| 5c 22 42 16 15 5c 66 0e | 13 3d 84 6a 00 5c 66 0e |\"B..\f.|.=.j.\f.|
|000024e0| 1c 42 16 1c 0e 5c 66 0e | 15 21 88 dd 16 1e df e0 |.B...\f.|.!......|
|000024f0| 21 88 e1 e2 21 88 0e 5c | 6e e3 3d 83 ed 00 5c 66 |!...!..\|n.=...\f|
|00002500| 0e 24 40 42 0e 24 41 42 | 16 24 e5 0e 0e 21 84 99 |.$@B.$AB|.$...!..|
|00002510| 00 e6 0e 24 21 88 d6 0e | 17 e7 e8 23 88 d6 0e 17 |...$!...|...#....|
|00002520| e9 ea 23 88 d6 0e 17 eb | ec 23 88 0e 0e 89 1e 2d |..#.....|.#.....-|
|00002530| 86 b8 00 0e 0f ee 3e 29 | 83 c8 00 d6 0e 17 ef f0 |......>)|........|
|00002540| 23 88 82 df 00 0e 0e 89 | 1e 2d 86 d2 00 0e 0f f1 |#.......|.-......|
|00002550| 3e 29 83 df 00 d6 0e 17 | ef f2 23 88 d6 0e 17 f3 |>)......|..#.....|
|00002560| f4 23 88 d6 0e 17 f5 f6 | 23 88 0e 0f d2 3d 83 fb |.#......|#....=..|
|00002570| 00 e1 f7 21 88 82 ff 00 | e1 f8 21 88 29 82 0f 01 |...!....|..!.)...|
|00002580| 0e 39 fa 3d 84 0f 01 fb | 0e 3c 21 88 29 5c 66 2a |.9.=....|.<!.)\f*|
|00002590| 87 22 20 5b 65 64 69 66 | 66 2d 75 6e 69 71 75 65 |." [edif|f-unique|
|000025a0| 2d 62 75 66 66 65 72 2d | 6e 61 6d 65 20 6d 65 74 |-buffer-|name met|
|000025b0| 61 2d 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 22 2a |a-buffer|-name "*|
|000025c0| 22 20 67 65 74 2d 62 75 | 66 66 65 72 2d 63 72 65 |" get-bu|ffer-cre|
|000025d0| 61 74 65 20 6d 65 74 61 | 2d 62 75 66 66 65 72 20 |ate meta|-buffer |
|000025e0| 53 74 61 72 74 42 75 66 | 66 65 72 20 67 65 74 2d |StartBuf|fer get-|
|000025f0| 62 75 66 66 65 72 20 62 | 75 66 66 65 72 2d 6e 61 |buffer b|uffer-na|
|00002600| 6d 65 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |me ((set|-buffer |
|00002610| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 65 64 |StartBuf|fer)) ed|
|00002620| 69 66 66 2d 6d 65 74 61 | 2d 6d 6f 64 65 20 61 63 |iff-meta|-mode ac|
|00002630| 74 69 6f 6e 2d 66 75 6e | 63 20 65 64 69 66 66 2d |tion-fun|c ediff-|
|00002640| 6d 65 74 61 2d 61 63 74 | 69 6f 6e 2d 66 75 6e 63 |meta-act|ion-func|
|00002650| 74 69 6f 6e 20 72 65 64 | 72 61 77 2d 66 75 6e 63 |tion red|raw-func|
|00002660| 74 69 6f 6e 20 65 64 69 | 66 66 2d 6d 65 74 61 2d |tion edi|ff-meta-|
|00002670| 72 65 64 72 61 77 2d 66 | 75 6e 63 74 69 6f 6e 20 |redraw-f|unction |
|00002680| 6a 6f 62 6e 61 6d 65 20 | 65 64 69 66 66 2d 6d 65 |jobname |ediff-me|
|00002690| 74 61 6a 6f 62 2d 6e 61 | 6d 65 20 65 64 69 66 66 |tajob-na|me ediff|
|000026a0| 2d 6d 65 74 61 2d 62 75 | 66 66 65 72 20 65 64 69 |-meta-bu|ffer edi|
|000026b0| 66 66 2d 73 65 74 75 70 | 2d 6d 65 74 61 2d 6d 61 |ff-setup|-meta-ma|
|000026c0| 70 20 65 64 69 66 66 2d | 72 65 67 69 73 74 72 79 |p ediff-|registry|
|000026d0| 20 65 64 69 66 66 2d 72 | 65 67 69 73 74 72 79 2d | ediff-r|egistry-|
|000026e0| 62 75 66 66 65 72 20 6d | 65 74 61 2d 6c 69 73 74 |buffer m|eta-list|
|000026f0| 20 65 64 69 66 66 2d 6d | 65 74 61 2d 6c 69 73 74 | ediff-m|eta-list|
|00002700| 20 64 65 66 69 6e 65 2d | 6b 65 79 20 65 64 69 66 | define-|key edif|
|00002710| 66 2d 6d 65 74 61 2d 62 | 75 66 66 65 72 2d 6d 61 |f-meta-b|uffer-ma|
|00002720| 70 20 22 4d 22 20 65 64 | 69 66 66 2d 73 68 6f 77 |p "M" ed|iff-show|
|00002730| 2d 6d 65 74 61 2d 62 75 | 66 66 2d 66 72 6f 6d 2d |-meta-bu|ff-from-|
|00002740| 72 65 67 69 73 74 72 79 | 20 6d 61 70 63 61 72 20 |registry| mapcar |
|00002750| 23 5b 28 65 6c 74 29 20 | 22 c0 89 c1 c2 0b 5c 22 |#[(elt) |".....\"|
|00002760| 42 42 87 22 20 5b 6e 69 | 6c 20 6d 61 70 63 61 72 |BB." [ni|l mapcar|
|00002770| 20 23 5b 28 6f 62 6a 29 | 20 22 08 c1 44 87 22 20 | #[(obj)| "..D." |
|00002780| 5b 6f 62 6a 20 6e 69 6c | 5d 20 32 5d 20 65 6c 74 |[obj nil|] 2] elt|
|00002790| 5d 20 35 5d 20 65 64 69 | 66 66 2d 73 65 73 73 69 |] 5] edi|ff-sessi|
|000027a0| 6f 6e 2d 72 65 67 69 73 | 74 72 79 20 74 20 62 75 |on-regis|try t bu|
|000027b0| 66 66 65 72 2d 72 65 61 | 64 2d 6f 6e 6c 79 20 73 |ffer-rea|d-only s|
|000027c0| 65 74 2d 62 75 66 66 65 | 72 2d 6d 6f 64 69 66 69 |et-buffe|r-modifi|
|000027d0| 65 64 2d 70 20 6e 69 6c | 20 72 75 6e 2d 68 6f 6f |ed-p nil| run-hoo|
|000027e0| 6b 73 20 73 74 61 72 74 | 75 70 2d 68 6f 6f 6b 73 |ks start|up-hooks|
|000027f0| 20 65 64 69 66 66 2d 66 | 69 6c 65 67 72 6f 75 70 | ediff-f|ilegroup|
|00002800| 2d 61 63 74 69 6f 6e 20 | 65 64 69 66 66 2d 64 69 |-action |ediff-di|
|00002810| 72 2d 64 69 66 66 65 72 | 65 6e 63 65 2d 6c 69 73 |r-differ|ence-lis|
|00002820| 74 20 65 64 69 66 66 2d | 6f 6e 65 2d 66 69 6c 65 |t ediff-|one-file|
|00002830| 67 72 6f 75 70 2d 6d 65 | 74 61 6a 6f 62 20 65 64 |group-me|tajob ed|
|00002840| 69 66 66 2d 64 72 61 77 | 2d 64 69 72 2d 64 69 66 |iff-draw|-dir-dif|
|00002850| 66 73 20 22 68 22 20 65 | 64 69 66 66 2d 6d 61 72 |fs "h" e|diff-mar|
|00002860| 6b 2d 66 6f 72 2d 68 69 | 64 69 6e 67 20 22 78 22 |k-for-hi|ding "x"|
|00002870| 20 65 64 69 66 66 2d 68 | 69 64 65 2d 6d 61 72 6b | ediff-h|ide-mark|
|00002880| 65 64 2d 73 65 73 73 69 | 6f 6e 73 20 22 6d 22 20 |ed-sessi|ons "m" |
|00002890| 65 64 69 66 66 2d 6d 61 | 72 6b 2d 66 6f 72 2d 6f |ediff-ma|rk-for-o|
|000028a0| 70 65 72 61 74 69 6f 6e | 20 6d 65 74 61 6a 6f 62 |peration| metajob|
|000028b0| 20 28 65 64 69 66 66 2d | 64 69 72 65 63 74 6f 72 | (ediff-|director|
|000028c0| 69 65 73 20 65 64 69 66 | 66 2d 64 69 72 65 63 74 |ies edif|f-direct|
|000028d0| 6f 72 79 2d 72 65 76 69 | 73 69 6f 6e 73 20 65 64 |ory-revi|sions ed|
|000028e0| 69 66 66 2d 6d 65 72 67 | 65 2d 64 69 72 65 63 74 |iff-merg|e-direct|
|000028f0| 6f 72 69 65 73 20 65 64 | 69 66 66 2d 6d 65 72 67 |ories ed|iff-merg|
|00002900| 65 2d 64 69 72 65 63 74 | 6f 72 69 65 73 2d 77 69 |e-direct|ories-wi|
|00002910| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 65 64 69 66 |th-ances|tor edif|
|00002920| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|00002930| 79 2d 72 65 76 69 73 69 | 6f 6e 73 20 65 64 69 66 |y-revisi|ons edif|
|00002940| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|00002950| 79 2d 72 65 76 69 73 69 | 6f 6e 73 2d 77 69 74 68 |y-revisi|ons-with|
|00002960| 2d 61 6e 63 65 73 74 6f | 72 29 20 22 50 22 20 65 |-ancesto|r) "P" e|
|00002970| 64 69 66 66 2d 63 6f 6c | 6c 65 63 74 2d 63 75 73 |diff-col|lect-cus|
|00002980| 74 6f 6d 2d 64 69 66 66 | 73 20 28 65 64 69 66 66 |tom-diff|s (ediff|
|00002990| 2d 6d 75 6c 74 69 66 69 | 6c 65 2d 70 61 74 63 68 |-multifi|le-patch|
|000029a0| 29 20 65 64 69 66 66 2d | 6d 65 74 61 2d 73 68 6f |) ediff-|meta-sho|
|000029b0| 77 2d 70 61 74 63 68 20 | 22 75 22 20 65 64 69 66 |w-patch |"u" edif|
|000029c0| 66 2d 75 70 2d 6d 65 74 | 61 2d 68 69 65 72 61 72 |f-up-met|a-hierar|
|000029d0| 63 68 79 20 22 44 22 20 | 65 64 69 66 66 2d 73 68 |chy "D" |ediff-sh|
|000029e0| 6f 77 2d 64 69 72 2d 64 | 69 66 66 73 20 65 64 69 |ow-dir-d|iffs edi|
|000029f0| 66 66 2d 72 65 67 69 73 | 74 72 79 2d 73 65 74 75 |ff-regis|try-setu|
|00002a00| 70 2d 68 6f 6f 6b 20 65 | 64 69 66 66 2d 73 65 73 |p-hook e|diff-ses|
|00002a10| 73 69 6f 6e 2d 67 72 6f | 75 70 2d 73 65 74 75 70 |sion-gro|up-setup|
|00002a20| 2d 68 6f 6f 6b 20 74 68 | 69 73 2d 63 6f 6d 6d 61 |-hook th|is-comma|
|00002a30| 6e 64 20 65 64 69 66 66 | 2d 71 75 69 74 20 65 72 |nd ediff|-quit er|
|00002a40| 72 6f 72 20 65 64 69 66 | 66 2d 4b 49 4c 4c 45 44 |ror edif|f-KILLED|
|00002a50| 2d 56 49 54 41 4c 2d 42 | 55 46 46 45 52 5d 20 35 |-VITAL-B|UFFER] 5|
|00002a60| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00002a70| 69 66 66 2d 72 65 64 72 | 61 77 2d 64 69 72 65 63 |iff-redr|aw-direc|
|00002a80| 74 6f 72 79 2d 67 72 6f | 75 70 2d 62 75 66 66 65 |tory-gro|up-buffe|
|00002a90| 72 20 23 5b 28 6d 65 74 | 61 2d 6c 69 73 74 29 20 |r #[(met|a-list) |
|00002aa0| 22 c0 09 21 c2 c3 c4 89 | 89 89 89 89 89 89 89 89 |"..!....|........|
|00002ab0| 1d 1e 06 1e 07 1e 08 1e | 09 1e 5c 6e 1e 0b 1e 5c |........|..\n...\|
|00002ac0| 66 1e 0d 1e 0e 1e 0f 1e | 10 1e 11 70 1e 12 0e 11 |f.......|...p....|
|00002ad0| 83 66 01 d3 0e 11 21 83 | 66 01 d4 d3 0e 11 21 21 |.f....!.|f.....!!|
|00002ae0| 83 66 01 d5 8e 0e 11 71 | 88 60 16 07 d6 20 88 d7 |.f.....q|.`... ..|
|00002af0| 0e 18 d9 0e 1a 21 5c 22 | 63 88 db 09 21 16 0e c4 |.....!\"|c...!...|
|00002b00| 1e 1c 0e 1a dd 3e 29 83 | 6c 00 de 63 88 82 7a 00 |.....>).|l..c..z.|
|00002b10| c4 1e 1c 0e 1a df 3e 29 | 83 7a 00 e0 63 88 e1 63 |......>)|.z..c..c|
|00002b20| 88 e2 20 84 87 00 e3 e4 | b1 02 88 0e 0e 3b 83 9c |.. .....|.....;..|
|00002b30| 00 0e 0e 47 c3 56 83 9c | 00 d7 e5 0e 0e 5c 22 63 |...G.V..|.....\"c|
|00002b40| 88 e6 63 88 09 41 89 11 | 89 16 06 83 ca 00 0e 10 |..c..A..|........|
|00002b50| 83 ca 00 0e 06 40 83 c1 | 00 e7 0e 06 40 21 e8 3d |.....@..|....@!.=|
|00002b60| 84 c1 00 c4 16 10 0e 06 | 41 89 16 06 84 a9 00 0e |........|A.......|
|00002b70| 10 83 d2 00 e9 63 88 09 | 83 58 01 09 40 16 0d 09 |.....c..|.X..@...|
|00002b80| 41 11 0e 0f 54 16 0f e7 | 0e 0d 21 e8 3d 84 d2 00 |A...T...|..!.=...|
|00002b90| ea 0e 0d 21 16 5c 66 eb | 0e 0d 21 16 0b ec 0e 0d |...!.\f.|..!.....|
|00002ba0| 21 16 5c 6e ed 0e 0d 21 | 16 09 60 16 08 0e 5c 66 |!.\n...!|..`...\f|
|00002bb0| 84 0f 01 ee 82 29 01 0e | 5c 66 83 28 01 d3 0e 5c |.....)..|\f.(...\|
|00002bc0| 66 21 83 28 01 d4 d3 0e | 5c 66 21 21 83 28 01 ef |f!.(....|\f!!.(..|
|00002bd0| 82 29 01 f0 63 88 e7 0e | 0d 21 86 33 01 ee 63 88 |.)..c...|.!.3..c.|
|00002be0| f1 f2 0e 0f 21 f3 b1 03 | 88 f4 0e 0b 21 88 f4 0e |....!...|....!...|
|00002bf0| 5c 6e 21 88 f4 0e 09 21 | 88 f5 0e 08 60 0e 0d 23 |\n!....!|....`..#|
|00002c00| 88 82 d2 00 f6 c4 21 88 | 0e 07 62 88 0e 11 29 82 |......!.|..b...).|
|00002c10| 71 01 0e 37 f8 3d 86 71 | 01 f9 0e 3a 21 2e 0e 87 |q..7.=.q|...:!...|
|00002c20| 22 20 5b 65 64 69 66 66 | 2d 67 65 74 2d 67 72 6f |" [ediff|-get-gro|
|00002c30| 75 70 2d 62 75 66 66 65 | 72 20 6d 65 74 61 2d 6c |up-buffe|r meta-l|
|00002c40| 69 73 74 20 74 20 30 20 | 6e 69 6c 20 62 75 66 66 |ist t 0 |nil buff|
|00002c50| 65 72 2d 72 65 61 64 2d | 6f 6e 6c 79 20 74 6d 70 |er-read-|only tmp|
|00002c60| 2d 6c 69 73 74 20 70 6f | 69 6e 74 20 70 74 20 66 |-list po|int pt f|
|00002c70| 33 20 66 32 20 66 31 20 | 73 65 73 73 69 6f 6e 2d |3 f2 f1 |session-|
|00002c80| 62 75 66 20 65 6c 74 20 | 72 65 67 65 78 70 20 73 |buf elt |regexp s|
|00002c90| 65 73 73 69 6f 6e 4e 75 | 6d 20 65 6d 70 74 79 20 |essionNu|m empty |
|00002ca0| 6d 65 74 61 2d 62 75 66 | 20 53 74 61 72 74 42 75 |meta-buf| StartBu|
|00002cb0| 66 66 65 72 20 67 65 74 | 2d 62 75 66 66 65 72 20 |ffer get|-buffer |
|00002cc0| 62 75 66 66 65 72 2d 6e | 61 6d 65 20 28 28 73 65 |buffer-n|ame ((se|
|00002cd0| 74 2d 62 75 66 66 65 72 | 20 53 74 61 72 74 42 75 |t-buffer| StartBu|
|00002ce0| 66 66 65 72 29 29 20 65 | 72 61 73 65 2d 62 75 66 |ffer)) e|rase-buf|
|00002cf0| 66 65 72 20 66 6f 72 6d | 61 74 20 65 64 69 66 66 |fer form|at ediff|
|00002d00| 2d 6d 65 74 61 2d 62 75 | 66 66 65 72 2d 6d 65 73 |-meta-bu|ffer-mes|
|00002d10| 73 61 67 65 20 65 64 69 | 66 66 2d 61 62 62 72 65 |sage edi|ff-abbre|
|00002d20| 76 2d 6a 6f 62 6e 61 6d | 65 20 65 64 69 66 66 2d |v-jobnam|e ediff-|
|00002d30| 6d 65 74 61 6a 6f 62 2d | 6e 61 6d 65 20 65 64 69 |metajob-|name edi|
|00002d40| 66 66 2d 67 65 74 2d 67 | 72 6f 75 70 2d 72 65 67 |ff-get-g|roup-reg|
|00002d50| 65 78 70 20 6d 65 74 61 | 6a 6f 62 20 28 65 64 69 |exp meta|job (edi|
|00002d60| 66 66 2d 64 69 72 65 63 | 74 6f 72 69 65 73 20 65 |ff-direc|tories e|
|00002d70| 64 69 66 66 2d 64 69 72 | 65 63 74 6f 72 79 2d 72 |diff-dir|ectory-r|
|00002d80| 65 76 69 73 69 6f 6e 73 | 20 65 64 69 66 66 2d 6d |evisions| ediff-m|
|00002d90| 65 72 67 65 2d 64 69 72 | 65 63 74 6f 72 69 65 73 |erge-dir|ectories|
|00002da0| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 64 69 72 | ediff-m|erge-dir|
|00002db0| 65 63 74 6f 72 69 65 73 | 2d 77 69 74 68 2d 61 6e |ectories|-with-an|
|00002dc0| 63 65 73 74 6f 72 20 65 | 64 69 66 66 2d 6d 65 72 |cestor e|diff-mer|
|00002dd0| 67 65 2d 64 69 72 65 63 | 74 6f 72 79 2d 72 65 76 |ge-direc|tory-rev|
|00002de0| 69 73 69 6f 6e 73 20 65 | 64 69 66 66 2d 6d 65 72 |isions e|diff-mer|
|00002df0| 67 65 2d 64 69 72 65 63 | 74 6f 72 79 2d 72 65 76 |ge-direc|tory-rev|
|00002e00| 69 73 69 6f 6e 73 2d 77 | 69 74 68 2d 61 6e 63 65 |isions-w|ith-ance|
|00002e10| 73 74 6f 72 29 20 22 20 | 20 20 20 20 60 50 27 3a |stor) " |    `P':|
|00002e20| 09 63 6f 6c 6c 65 63 74 | 20 63 75 73 74 6f 6d 20 |.collect| custom |
|00002e30| 64 69 66 66 73 20 6f 66 | 20 61 6c 6c 20 6d 61 72 |diffs of| all mar|
|00002e40| 6b 65 64 20 73 65 73 73 | 69 6f 6e 73 5c 6e 22 20 |ked sess|ions\n" |
|00002e50| 28 65 64 69 66 66 2d 6d | 75 6c 74 69 66 69 6c 65 |(ediff-m|ultifile|
|00002e60| 2d 70 61 74 63 68 29 20 | 22 20 20 20 20 20 60 50 |-patch) |"     `P|
|00002e70| 27 3a 09 73 68 6f 77 20 | 70 61 74 63 68 20 61 70 |':.show |patch ap|
|00002e80| 70 72 6f 70 72 69 61 74 | 65 6c 79 20 66 6f 72 20 |propriat|ely for |
|00002e90| 74 68 65 20 63 6f 6e 74 | 65 78 74 20 28 73 65 73 |the cont|ext (ses|
|00002ea0| 73 69 6f 6e 20 6f 72 20 | 67 72 6f 75 70 29 5c 6e |sion or |group)\n|
|00002eb0| 22 20 22 20 20 20 20 20 | 60 75 27 3a 09 73 68 6f |" "     |`u':.sho|
|00002ec0| 77 20 70 61 72 65 6e 74 | 20 73 65 73 73 69 6f 6e |w parent| session|
|00002ed0| 20 67 72 6f 75 70 5c 6e | 22 20 65 64 69 66 66 2d | group\n|" ediff-|
|00002ee0| 6f 6e 65 2d 66 69 6c 65 | 67 72 6f 75 70 2d 6d 65 |one-file|group-me|
|00002ef0| 74 61 6a 6f 62 20 22 20 | 20 20 20 20 60 44 27 3a |tajob " |    `D':|
|00002f00| 09 73 68 6f 77 20 64 69 | 66 66 65 72 65 6e 63 65 |.show di|fference|
|00002f10| 73 20 61 6d 6f 6e 67 20 | 64 69 72 65 63 74 6f 72 |s among |director|
|00002f20| 69 65 73 5c 6e 22 20 22 | 20 20 20 20 20 60 3d 27 |ies\n" "|     `='|
|00002f30| 3a 09 6d 61 72 6b 20 69 | 64 65 6e 74 69 63 61 6c |:.mark i|dentical|
|00002f40| 20 66 69 6c 65 73 20 69 | 6e 20 65 61 63 68 20 73 | files i|n each s|
|00002f50| 65 73 73 69 6f 6e 5c 6e | 5c 6e 22 20 22 46 69 6c |ession\n|\n" "Fil|
|00002f60| 74 65 72 2d 74 68 72 6f | 75 67 68 20 72 65 67 75 |ter-thro|ugh regu|
|00002f70| 6c 61 72 20 65 78 70 72 | 65 73 73 69 6f 6e 3a 20 |lar expr|ession: |
|00002f80| 25 73 5c 6e 22 20 22 5c | 6e 5c 6e 20 20 20 20 20 |%s\n" "\|n\n     |
|00002f90| 20 20 20 53 69 7a 65 20 | 20 20 4c 61 73 74 20 6d |   Size |  Last m|
|00002fa0| 6f 64 69 66 69 65 64 20 | 20 20 20 20 20 20 20 20 |odified |        |
|00002fb0| 20 20 4e 61 6d 65 5c 6e | 20 20 20 20 2d 2d 2d 2d |  Name\n|    ----|
|00002fc0| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00002fd0| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00002fe0| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00002ff0| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00003000| 2d 2d 2d 5c 6e 5c 6e 22 | 20 65 64 69 66 66 2d 67 |---\n\n"| ediff-g|
|00003010| 65 74 2d 73 65 73 73 69 | 6f 6e 2d 73 74 61 74 75 |et-sessi|on-statu|
|00003020| 73 20 37 33 20 22 20 20 | 20 20 20 2a 2a 2a 2a 2a |s 73 "  |   *****|
|00003030| 2a 20 20 20 2a 2a 2a 2a | 2a 2a 20 20 20 54 68 69 |*   ****|**   Thi|
|00003040| 73 20 73 65 73 73 69 6f | 6e 20 67 72 6f 75 70 20 |s sessio|n group |
|00003050| 68 61 73 20 6e 6f 20 6d | 65 6d 62 65 72 73 5c 6e |has no m|embers\n|
|00003060| 22 20 65 64 69 66 66 2d | 67 65 74 2d 73 65 73 73 |" ediff-|get-sess|
|00003070| 69 6f 6e 2d 62 75 66 66 | 65 72 20 65 64 69 66 66 |ion-buff|er ediff|
|00003080| 2d 67 65 74 2d 73 65 73 | 73 69 6f 6e 2d 6f 62 6a |-get-ses|sion-obj|
|00003090| 41 20 65 64 69 66 66 2d | 67 65 74 2d 73 65 73 73 |A ediff-|get-sess|
|000030a0| 69 6f 6e 2d 6f 62 6a 42 | 20 65 64 69 66 66 2d 67 |ion-objB| ediff-g|
|000030b0| 65 74 2d 73 65 73 73 69 | 6f 6e 2d 6f 62 6a 43 20 |et-sessi|on-objC |
|000030c0| 22 20 22 20 22 2b 22 20 | 22 2d 22 20 22 20 20 53 |" " "+" |"-" "  S|
|000030d0| 65 73 73 69 6f 6e 20 22 | 20 69 6e 74 2d 74 6f 2d |ession "| int-to-|
|000030e0| 73 74 72 69 6e 67 20 22 | 3a 5c 6e 22 20 65 64 69 |string "|:\n" edi|
|000030f0| 66 66 2d 6d 65 74 61 2d | 69 6e 73 65 72 74 2d 66 |ff-meta-|insert-f|
|00003100| 69 6c 65 2d 69 6e 66 6f | 20 65 64 69 66 66 2d 73 |ile-info| ediff-s|
|00003110| 65 74 2d 6d 65 74 61 2d | 6f 76 65 72 6c 61 79 20 |et-meta-|overlay |
|00003120| 73 65 74 2d 62 75 66 66 | 65 72 2d 6d 6f 64 69 66 |set-buff|er-modif|
|00003130| 69 65 64 2d 70 20 74 68 | 69 73 2d 63 6f 6d 6d 61 |ied-p th|is-comma|
|00003140| 6e 64 20 65 64 69 66 66 | 2d 71 75 69 74 20 65 72 |nd ediff|-quit er|
|00003150| 72 6f 72 20 65 64 69 66 | 66 2d 4b 49 4c 4c 45 44 |ror edif|f-KILLED|
|00003160| 2d 56 49 54 41 4c 2d 42 | 55 46 46 45 52 5d 20 31 |-VITAL-B|UFFER] 1|
|00003170| 34 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |4]).(def|alias 'e|
|00003180| 64 69 66 66 2d 70 72 6f | 62 6c 65 6d 61 74 69 63 |diff-pro|blematic|
|00003190| 2d 73 65 73 73 69 6f 6e | 2d 70 20 23 5b 28 73 65 |-session|-p #[(se|
|000031a0| 73 73 69 6f 6e 29 20 22 | c0 09 21 c2 09 21 c3 09 |ssion) "|..!..!..|
|000031b0| 21 1c 1d 89 1e 06 3b 83 | 3e 00 c7 0e 06 21 84 3e |!.....;.|>....!.>|
|000031c0| 00 0d 3b 83 3e 00 c7 0d | 21 84 3e 00 5c 66 3b 83 |..;.>...|!.>.\f;.|
|000031d0| 3e 00 c7 5c 66 21 83 3e | 00 c8 1e 09 0e 5c 6e cb |>..\f!.>|.....\n.|
|000031e0| 3e 29 83 3e 00 cc 82 3f | 00 c8 2b 87 22 20 5b 65 |>).>...?|..+." [e|
|000031f0| 64 69 66 66 2d 67 65 74 | 2d 73 65 73 73 69 6f 6e |diff-get|-session|
|00003200| 2d 6f 62 6a 41 2d 6e 61 | 6d 65 20 73 65 73 73 69 |-objA-na|me sessi|
|00003210| 6f 6e 20 65 64 69 66 66 | 2d 67 65 74 2d 73 65 73 |on ediff|-get-ses|
|00003220| 73 69 6f 6e 2d 6f 62 6a | 42 2d 6e 61 6d 65 20 65 |sion-obj|B-name e|
|00003230| 64 69 66 66 2d 67 65 74 | 2d 73 65 73 73 69 6f 6e |diff-get|-session|
|00003240| 2d 6f 62 6a 43 2d 6e 61 | 6d 65 20 66 33 20 66 32 |-objC-na|me f3 f2|
|00003250| 20 66 31 20 66 69 6c 65 | 2d 64 69 72 65 63 74 6f | f1 file|-directo|
|00003260| 72 79 2d 70 20 6e 69 6c | 20 6d 65 74 61 6a 6f 62 |ry-p nil| metajob|
|00003270| 20 65 64 69 66 66 2d 6d | 65 74 61 6a 6f 62 2d 6e | ediff-m|etajob-n|
|00003280| 61 6d 65 20 28 65 64 69 | 66 66 2d 6d 65 72 67 65 |ame (edi|ff-merge|
|00003290| 2d 64 69 72 65 63 74 6f | 72 69 65 73 2d 77 69 74 |-directo|ries-wit|
|000032a0| 68 2d 61 6e 63 65 73 74 | 6f 72 20 65 64 69 66 66 |h-ancest|or ediff|
|000032b0| 2d 6d 65 72 67 65 2d 66 | 69 6c 65 67 72 6f 75 70 |-merge-f|ilegroup|
|000032c0| 73 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 29 |s-with-a|ncestor)|
|000032d0| 20 61 6e 63 65 73 74 6f | 72 2d 69 73 2d 64 69 72 | ancesto|r-is-dir|
|000032e0| 5d 20 35 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |] 5]).(d|efalias |
|000032f0| 27 65 64 69 66 66 2d 6d | 65 74 61 2d 69 6e 73 65 |'ediff-m|eta-inse|
|00003300| 72 74 2d 66 69 6c 65 2d | 69 6e 66 6f 20 23 5b 28 |rt-file-|info #[(|
|00003310| 66 69 6c 65 69 6e 66 6f | 29 20 22 c0 09 40 09 89 |fileinfo|) "..@..|
|00003320| 1a 41 40 29 c3 1c 1d 1e | 06 1e 07 0e 06 3b 83 34 |.A@)....|.....;.4|
|00003330| 00 c8 0e 06 21 83 34 00 | 0e 06 1e 09 ca 0e 09 cb |....!.4.|........|
|00003340| 5c 22 29 16 07 0e 06 1e | 09 ca 0e 09 cc 5c 22 29 |\").....|.....\")|
|00003350| 14 0e 06 3b 85 7b 00 cd | ce 0d 83 44 00 cf 82 45 |...;.{..|...D...E|
|00003360| 00 d0 cd d1 0e 07 d2 57 | 83 52 00 d3 82 54 00 0e |.......W|.R...T..|
|00003370| 07 5c 22 0e 07 d2 57 83 | 60 00 d4 82 65 00 d5 d6 |.\"...W.|`...e...|
|00003380| 5c 66 21 21 d7 0e 06 21 | 83 75 00 d8 d9 0e 06 21 |\f!!...!|.u.....!|
|00003390| 21 82 79 00 d9 0e 06 21 | 25 63 2c 87 22 20 5b 2d |!.y....!|%c,." [-|
|000033a0| 31 20 66 69 6c 65 69 6e | 66 6f 20 65 6c 74 20 22 |1 filein|fo elt "|
|000033b0| 2a 66 69 6c 65 20 64 6f | 65 73 6e 27 74 20 65 78 |*file do|esn't ex|
|000033c0| 69 73 74 2a 22 20 66 69 | 6c 65 2d 6d 6f 64 74 69 |ist*" fi|le-modti|
|000033d0| 6d 65 20 66 65 71 20 66 | 6e 61 6d 65 20 66 69 6c |me feq f|name fil|
|000033e0| 65 2d 73 69 7a 65 20 66 | 69 6c 65 2d 65 78 69 73 |e-size f|ile-exis|
|000033f0| 74 73 2d 70 20 66 69 6c | 65 6e 61 6d 65 20 65 64 |ts-p fil|ename ed|
|00003400| 69 66 66 2d 66 69 6c 65 | 2d 61 74 74 72 69 62 75 |iff-file|-attribu|
|00003410| 74 65 73 20 37 20 35 20 | 66 6f 72 6d 61 74 20 22 |tes 7 5 |format "|
|00003420| 25 73 20 20 25 73 20 20 | 20 25 2d 32 30 73 20 20 |%s  %s  | %-20s  |
|00003430| 20 25 73 5c 6e 22 20 22 | 3d 22 20 22 20 22 20 22 | %s\n" "|=" " " "|
|00003440| 25 31 30 73 22 20 30 20 | 22 72 65 6d 6f 74 65 22 |%10s" 0 |"remote"|
|00003450| 20 22 66 69 6c 65 22 20 | 65 64 69 66 66 2d 66 6f | "file" |ediff-fo|
|00003460| 72 6d 61 74 2d 64 61 74 | 65 20 64 65 63 6f 64 65 |rmat-dat|e decode|
|00003470| 2d 74 69 6d 65 20 66 69 | 6c 65 2d 64 69 72 65 63 |-time fi|le-direc|
|00003480| 74 6f 72 79 2d 70 20 66 | 69 6c 65 2d 6e 61 6d 65 |tory-p f|ile-name|
|00003490| 2d 61 73 2d 64 69 72 65 | 63 74 6f 72 79 20 65 64 |-as-dire|ctory ed|
|000034a0| 69 66 66 2d 61 62 62 72 | 65 76 69 61 74 65 2d 66 |iff-abbr|eviate-f|
|000034b0| 69 6c 65 2d 6e 61 6d 65 | 5d 20 39 5d 29 0a 23 40 |ile-name|] 9]).#@|
|000034c0| 32 38 20 4d 6f 6e 74 68 | 73 27 20 61 73 73 6f 63 |28 Month|s' assoc|
|000034d0| 69 61 74 69 76 65 20 61 | 72 72 61 79 2e 1f 0a 28 |iative a|rray...(|
|000034e0| 64 65 66 63 6f 6e 73 74 | 20 65 64 69 66 66 2d 6d |defconst| ediff-m|
|000034f0| 6f 6e 74 68 73 20 28 71 | 75 6f 74 65 20 28 28 31 |onths (q|uote ((1|
|00003500| 20 2e 20 22 4a 61 6e 22 | 29 20 28 32 20 2e 20 22 | . "Jan"|) (2 . "|
|00003510| 46 65 62 22 29 20 28 33 | 20 2e 20 22 4d 61 72 22 |Feb") (3| . "Mar"|
|00003520| 29 20 28 34 20 2e 20 22 | 41 70 72 22 29 20 28 35 |) (4 . "|Apr") (5|
|00003530| 20 2e 20 22 4d 61 79 22 | 29 20 28 36 20 2e 20 22 | . "May"|) (6 . "|
|00003540| 4a 75 6e 22 29 20 28 37 | 20 2e 20 22 4a 75 6c 22 |Jun") (7| . "Jul"|
|00003550| 29 20 28 38 20 2e 20 22 | 41 75 67 22 29 20 28 39 |) (8 . "|Aug") (9|
|00003560| 20 2e 20 22 53 65 70 22 | 29 20 28 31 30 20 2e 20 | . "Sep"|) (10 . |
|00003570| 22 4f 63 74 22 29 20 28 | 31 31 20 2e 20 22 4e 6f |"Oct") (|11 . "No|
|00003580| 76 22 29 20 28 31 32 20 | 2e 20 22 44 65 63 22 29 |v") (12 |. "Dec")|
|00003590| 29 29 20 28 23 24 20 2e | 20 31 33 35 30 37 29 29 |)) (#$ .| 13507))|
|000035a0| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|000035b0| 66 2d 66 6f 72 6d 61 74 | 2d 64 61 74 65 20 23 5b |f-format|-date #[|
|000035c0| 28 74 69 6d 65 29 20 22 | c0 c1 c2 c3 5c 66 38 0d |(time) "|....\f8.|
|000035d0| 5c 22 41 c6 5c 66 38 c7 | 5c 66 38 c8 c9 5c 66 38 |\"A.\f8.|\f8..\f8|
|000035e0| 21 c8 5c 66 41 40 21 c8 | 5c 66 40 21 26 07 87 22 |!.\fA@!.|\f@!&.."|
|000035f0| 20 5b 66 6f 72 6d 61 74 | 20 22 25 73 20 25 32 64 | [format| "%s %2d|
|00003600| 20 25 34 64 20 25 73 3a | 25 73 3a 25 73 22 20 61 | %4d %s:|%s:%s" a|
|00003610| 73 73 6f 63 20 34 20 74 | 69 6d 65 20 65 64 69 66 |ssoc 4 t|ime edif|
|00003620| 66 2d 6d 6f 6e 74 68 73 | 20 33 20 35 20 65 64 69 |f-months| 3 5 edi|
|00003630| 66 66 2d 66 69 6c 6c 2d | 6c 65 61 64 69 6e 67 2d |ff-fill-|leading-|
|00003640| 7a 65 72 6f 20 32 5d 20 | 39 5d 29 0a 28 64 65 66 |zero 2] |9]).(def|
|00003650| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 66 69 6c |alias 'e|diff-fil|
|00003660| 6c 2d 6c 65 61 64 69 6e | 67 2d 7a 65 72 6f 20 23 |l-leadin|g-zero #|
|00003670| 5b 28 6e 75 6d 29 20 22 | 08 c1 57 83 0b 00 c2 c3 |[(num) "|..W.....|
|00003680| 08 5c 22 87 c4 08 21 87 | 22 20 5b 6e 75 6d 20 31 |.\"...!.|" [num 1|
|00003690| 30 20 66 6f 72 6d 61 74 | 20 22 30 25 64 22 20 6e |0 format| "0%d" n|
|000036a0| 75 6d 62 65 72 2d 74 6f | 2d 73 74 72 69 6e 67 5d |umber-to|-string]|
|000036b0| 20 33 5d 29 0a 28 70 75 | 74 20 28 71 75 6f 74 65 | 3]).(pu|t (quote|
|000036c0| 20 65 64 69 66 66 2d 66 | 69 6c 6c 2d 6c 65 61 64 | ediff-f|ill-lead|
|000036d0| 69 6e 67 2d 7a 65 72 6f | 29 20 28 71 75 6f 74 65 |ing-zero|) (quote|
|000036e0| 20 62 79 74 65 2d 6f 70 | 74 69 6d 69 7a 65 72 29 | byte-op|timizer)|
|000036f0| 20 28 71 75 6f 74 65 20 | 62 79 74 65 2d 63 6f 6d | (quote |byte-com|
|00003700| 70 69 6c 65 2d 69 6e 6c | 69 6e 65 2d 65 78 70 61 |pile-inl|ine-expa|
|00003710| 6e 64 29 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |nd)).(de|falias '|
|00003720| 65 64 69 66 66 2d 64 72 | 61 77 2d 64 69 72 2d 64 |ediff-dr|aw-dir-d|
|00003730| 69 66 66 73 20 23 5b 28 | 64 69 66 66 2d 6c 69 73 |iffs #[(|diff-lis|
|00003740| 74 29 20 22 08 84 08 00 | c1 c2 21 88 c3 c4 c5 5c |t) "....|..!....\|
|00003750| 22 1e 06 c7 08 21 1e 08 | c9 ca 08 21 21 1e 0b c9 |"....!..|...!!...|
|00003760| cc 08 21 21 1e 0d ce 08 | 21 89 1e 0f 3b 85 2f 00 |..!!....|!...;./.|
|00003770| c9 0e 0f 21 1e 0f d0 08 | 21 1e 11 d2 d3 d4 5c 22 |...!....|!.....\"|
|00003780| 1e 15 d6 1e 17 d6 1e 18 | d6 1e 19 08 41 10 da 0e |........|....A...|
|00003790| 06 21 16 1b 70 1e 1c 0e | 1b 83 9f 01 dd 0e 1b 21 |.!..p...|.......!|
|000037a0| 83 9f 01 de dd 0e 1b 21 | 21 83 9f 01 df 8e 0e 1b |.......!|!.......|
|000037b0| 71 88 e0 0e 21 21 88 e2 | 20 88 0e 11 16 23 e4 63 |q...!!..| ....#.c|
|000037c0| 88 e5 63 88 0e 08 3b 83 | 93 00 0e 08 47 e6 56 83 |..c...;.|....G.V.|
|000037d0| 93 00 e7 e8 0e 08 5c 22 | 63 88 e9 63 88 e7 ea eb |......\"|c..c....|
|000037e0| c9 ec 0e 0b 21 21 ed 5c | 22 eb c9 ec 0e 0d 21 21 |....!!.\|".....!!|
|000037f0| ed 5c 22 23 63 88 0e 0f | 83 c3 00 e7 ee eb c9 ec |.\"#c...|........|
|00003800| 0e 0f 21 21 ed 5c 22 5c | 22 63 88 82 c6 00 e9 63 |..!!.\"\|"c.....c|
|00003810| 88 e7 ef 0e 15 89 23 63 | 88 0e 0f 3b 83 de 00 e7 |......#c|...;....|
|00003820| f0 0e 15 5c 22 63 88 82 | e1 00 f1 63 88 08 84 e8 |...\"c..|...c....|
|00003830| 00 f2 63 88 08 83 95 01 | 08 40 40 16 17 08 40 41 |..c.....|.@@...@A|
|00003840| 16 18 08 41 10 f3 0e 18 | f4 5c 22 e6 55 83 23 01 |...A....|.\".U.#.|
|00003850| e7 f5 eb c9 f6 0e 0b 0e | 17 50 21 83 18 01 ec 0e |........|.P!.....|
|00003860| 17 21 82 1a 01 0e 17 21 | f7 5c 22 5c 22 63 88 82 |.!.....!|.\"\"c..|
|00003870| 29 01 e7 f5 f8 5c 22 63 | 88 f3 0e 18 f9 5c 22 e6 |)....\"c|.....\".|
|00003880| 55 83 53 01 e7 fa eb c9 | f6 0e 0d 0e 17 50 21 83 |U.S.....|.....P!.|
|00003890| 48 01 ec 0e 17 21 82 4a | 01 0e 17 21 f7 5c 22 5c |H....!.J|...!.\"\|
|000038a0| 22 63 88 82 59 01 e7 fa | f8 5c 22 63 88 0e 0f 3b |"c..Y...|.\"c...;|
|000038b0| 83 8f 01 f3 0e 18 fb 5c | 22 e6 55 83 89 01 e7 fc |.......\|".U.....|
|000038c0| eb c9 f6 0e 0f 0e 17 50 | 21 83 7e 01 ec 0e 17 21 |.......P|!.~....!|
|000038d0| 82 80 01 0e 17 21 f7 5c | 22 5c 22 63 88 82 8f 01 |.....!.\|"\"c....|
|000038e0| e7 fc f8 5c 22 63 88 e9 | 63 88 82 e8 00 fd 16 19 |...\"c..|c.......|
|000038f0| fe d6 21 29 82 ac 01 0e | 3f 81 40 00 3d 86 ac 01 |..!)....|?.@.=...|
|00003900| c1 0e 41 21 2e 5c 66 87 | 22 20 5b 64 69 66 66 2d |..A!.\f.|" [diff-|
|00003910| 6c 69 73 74 20 65 72 72 | 6f 72 20 22 4c 6f 73 74 |list err|or "Lost|
|00003920| 20 64 69 66 66 65 72 65 | 6e 63 65 20 69 6e 66 6f | differe|nce info|
|00003930| 20 6f 6e 20 74 68 65 73 | 65 20 64 69 72 65 63 74 | on thes|e direct|
|00003940| 6f 72 69 65 73 22 20 65 | 64 69 66 66 2d 75 6e 69 |ories" e|diff-uni|
|00003950| 71 75 65 2d 62 75 66 66 | 65 72 2d 6e 61 6d 65 20 |que-buff|er-name |
|00003960| 22 2a 45 64 69 66 66 20 | 46 69 6c 65 20 47 72 6f |"*Ediff |File Gro|
|00003970| 75 70 20 44 69 66 66 65 | 72 65 6e 63 65 73 22 20 |up Diffe|rences" |
|00003980| 22 2a 22 20 62 75 66 2d | 6e 61 6d 65 20 65 64 69 |"*" buf-|name edi|
|00003990| 66 66 2d 67 65 74 2d 67 | 72 6f 75 70 2d 72 65 67 |ff-get-g|roup-reg|
|000039a0| 65 78 70 20 72 65 67 65 | 78 70 20 65 64 69 66 66 |exp rege|xp ediff|
|000039b0| 2d 61 62 62 72 65 76 69 | 61 74 65 2d 66 69 6c 65 |-abbrevi|ate-file|
|000039c0| 2d 6e 61 6d 65 20 65 64 | 69 66 66 2d 67 65 74 2d |-name ed|iff-get-|
|000039d0| 67 72 6f 75 70 2d 6f 62 | 6a 41 20 64 69 72 31 20 |group-ob|jA dir1 |
|000039e0| 65 64 69 66 66 2d 67 65 | 74 2d 67 72 6f 75 70 2d |ediff-ge|t-group-|
|000039f0| 6f 62 6a 42 20 64 69 72 | 32 20 65 64 69 66 66 2d |objB dir|2 ediff-|
|00003a00| 67 65 74 2d 67 72 6f 75 | 70 2d 6f 62 6a 43 20 64 |get-grou|p-objC d|
|00003a10| 69 72 33 20 65 64 69 66 | 66 2d 67 65 74 2d 67 72 |ir3 edif|f-get-gr|
|00003a20| 6f 75 70 2d 62 75 66 66 | 65 72 20 6d 65 74 61 2d |oup-buff|er meta-|
|00003a30| 62 75 66 20 6d 61 6b 65 | 2d 73 74 72 69 6e 67 20 |buf make|-string |
|00003a40| 32 36 20 34 35 20 75 6e | 64 65 72 6c 69 6e 65 20 |26 45 un|derline |
|00003a50| 6e 69 6c 20 66 69 6c 65 | 20 63 6f 64 65 20 62 75 |nil file| code bu|
|00003a60| 66 66 65 72 2d 72 65 61 | 64 2d 6f 6e 6c 79 20 67 |ffer-rea|d-only g|
|00003a70| 65 74 2d 62 75 66 66 65 | 72 2d 63 72 65 61 74 65 |et-buffe|r-create|
|00003a80| 20 65 64 69 66 66 2d 64 | 69 72 2d 64 69 66 66 73 | ediff-d|ir-diffs|
|00003a90| 2d 62 75 66 66 65 72 20 | 53 74 61 72 74 42 75 66 |-buffer |StartBuf|
|00003aa0| 66 65 72 20 67 65 74 2d | 62 75 66 66 65 72 20 62 |fer get-|buffer b|
|00003ab0| 75 66 66 65 72 2d 6e 61 | 6d 65 20 28 28 73 65 74 |uffer-na|me ((set|
|00003ac0| 2d 62 75 66 66 65 72 20 | 53 74 61 72 74 42 75 66 |-buffer |StartBuf|
|00003ad0| 66 65 72 29 29 20 75 73 | 65 2d 6c 6f 63 61 6c 2d |fer)) us|e-local-|
|00003ae0| 6d 61 70 20 65 64 69 66 | 66 2d 64 69 72 2d 64 69 |map edif|f-dir-di|
|00003af0| 66 66 73 2d 62 75 66 66 | 65 72 2d 6d 61 70 20 65 |ffs-buff|er-map e|
|00003b00| 72 61 73 65 2d 62 75 66 | 66 65 72 20 65 64 69 66 |rase-buf|fer edif|
|00003b10| 66 2d 6d 65 74 61 2d 62 | 75 66 66 65 72 20 22 09 |f-meta-b|uffer ".|
|00003b20| 09 2a 2a 2a 20 44 69 72 | 65 63 74 6f 72 79 20 44 |.*** Dir|ectory D|
|00003b30| 69 66 66 65 72 65 6e 63 | 65 73 20 2a 2a 2a 5c 6e |ifferenc|es ***\n|
|00003b40| 22 20 22 5c 6e 55 73 65 | 66 75 6c 20 63 6f 6d 6d |" "\nUse|ful comm|
|00003b50| 61 6e 64 73 3a 5c 6e 20 | 20 20 20 20 60 71 27 3a |ands:\n |    `q':|
|00003b60| 20 68 69 64 65 20 74 68 | 69 73 20 62 75 66 66 65 | hide th|is buffe|
|00003b70| 72 5c 6e 20 20 20 20 20 | 53 50 43 3a 20 6e 65 78 |r\n     |SPC: nex|
|00003b80| 74 20 6c 69 6e 65 5c 6e | 20 20 20 20 20 44 45 4c |t line\n|     DEL|
|00003b90| 3a 20 70 72 65 76 69 6f | 75 73 20 6c 69 6e 65 5c |: previo|us line\|
|00003ba0| 6e 5c 6e 22 20 30 20 66 | 6f 72 6d 61 74 20 22 46 |n\n" 0 f|ormat "F|
|00003bb0| 69 6c 74 65 72 2d 74 68 | 72 6f 75 67 68 20 72 65 |ilter-th|rough re|
|00003bc0| 67 75 6c 61 72 20 65 78 | 70 72 65 73 73 69 6f 6e |gular ex|pression|
|00003bd0| 3a 20 25 73 5c 6e 22 20 | 22 5c 6e 22 20 22 5c 6e |: %s\n" |"\n" "\n|
|00003be0| 25 2d 32 37 73 25 2d 32 | 36 73 22 20 65 64 69 66 |%-27s%-2|6s" edif|
|00003bf0| 66 2d 74 72 75 6e 63 61 | 74 65 2d 73 74 72 69 6e |f-trunca|te-strin|
|00003c00| 67 2d 6c 65 66 74 20 66 | 69 6c 65 2d 6e 61 6d 65 |g-left f|ile-name|
|00003c10| 2d 61 73 2d 64 69 72 65 | 63 74 6f 72 79 20 32 35 |-as-dire|ctory 25|
|00003c20| 20 22 20 25 2d 32 35 73 | 5c 6e 22 20 22 25 73 25 | " %-25s|\n" "%s%|
|00003c30| 73 22 20 22 25 73 5c 6e | 5c 6e 22 20 22 5c 6e 5c |s" "%s\n|\n" "\n\|
|00003c40| 6e 22 20 22 5c 6e 09 2a | 2a 2a 20 20 4e 6f 20 64 |n" "\n.*|**  No d|
|00003c50| 69 66 66 65 72 65 6e 63 | 65 73 20 20 2a 2a 2a 5c |ifferenc|es  ***\|
|00003c60| 6e 22 20 6d 6f 64 20 32 | 20 22 25 2d 32 37 73 22 |n" mod 2| "%-27s"|
|00003c70| 20 66 69 6c 65 2d 64 69 | 72 65 63 74 6f 72 79 2d | file-di|rectory-|
|00003c80| 70 20 32 34 20 22 2d 2d | 2d 22 20 33 20 22 25 2d |p 24 "--|-" 3 "%-|
|00003c90| 32 36 73 22 20 35 20 22 | 20 25 2d 32 35 73 22 20 |26s" 5 "| %-25s" |
|00003ca0| 74 20 73 65 74 2d 62 75 | 66 66 65 72 2d 6d 6f 64 |t set-bu|ffer-mod|
|00003cb0| 69 66 69 65 64 2d 70 20 | 74 68 69 73 2d 63 6f 6d |ified-p |this-com|
|00003cc0| 6d 61 6e 64 20 65 64 69 | 66 66 2d 71 75 69 74 20 |mand edi|ff-quit |
|00003cd0| 65 64 69 66 66 2d 4b 49 | 4c 4c 45 44 2d 56 49 54 |ediff-KI|LLED-VIT|
|00003ce0| 41 4c 2d 42 55 46 46 45 | 52 5d 20 38 5d 29 0a 23 |AL-BUFFE|R] 8]).#|
|00003cf0| 40 37 32 20 42 75 72 79 | 20 74 68 65 20 64 69 72 |@72 Bury| the dir|
|00003d00| 65 63 74 6f 72 79 20 64 | 69 66 66 65 72 65 6e 63 |ectory d|ifferenc|
|00003d10| 65 20 62 75 66 66 65 72 | 2e 20 44 69 73 70 6c 61 |e buffer|. Displa|
|00003d20| 79 20 74 68 65 20 6d 65 | 74 61 20 62 75 66 66 65 |y the me|ta buffe|
|00003d30| 72 20 69 6e 73 74 65 61 | 64 2e 1f 0a 28 64 65 66 |r instea|d...(def|
|00003d40| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 62 75 72 |alias 'e|diff-bur|
|00003d50| 79 2d 64 69 72 2d 64 69 | 66 66 73 2d 62 75 66 66 |y-dir-di|ffs-buff|
|00003d60| 65 72 20 23 5b 6e 69 6c | 20 22 08 c1 1a 1b c4 20 |er #[nil| "..... |
|00003d70| 88 c5 0b 21 89 12 83 15 | 00 c6 5c 6e 21 82 1a 00 |...!....|..\n!...|
|00003d80| c7 c8 20 0b 5c 22 2a 87 | 22 20 5b 65 64 69 66 66 |.. .\"*.|" [ediff|
|00003d90| 2d 6d 65 74 61 2d 62 75 | 66 66 65 72 20 6e 69 6c |-meta-bu|ffer nil|
|00003da0| 20 77 69 6e 64 20 62 75 | 66 20 62 75 72 79 2d 62 | wind bu|f bury-b|
|00003db0| 75 66 66 65 72 20 65 64 | 69 66 66 2d 67 65 74 2d |uffer ed|iff-get-|
|00003dc0| 76 69 73 69 62 6c 65 2d | 62 75 66 66 65 72 2d 77 |visible-|buffer-w|
|00003dd0| 69 6e 64 6f 77 20 73 65 | 6c 65 63 74 2d 77 69 6e |indow se|lect-win|
|00003de0| 64 6f 77 20 73 65 74 2d | 77 69 6e 64 6f 77 2d 62 |dow set-|window-b|
|00003df0| 75 66 66 65 72 20 73 65 | 6c 65 63 74 65 64 2d 77 |uffer se|lected-w|
|00003e00| 69 6e 64 6f 77 5d 20 33 | 20 28 23 24 20 2e 20 31 |indow] 3| (#$ . 1|
|00003e10| 35 36 30 34 29 20 6e 69 | 6c 5d 29 0a 23 40 37 30 |5604) ni|l]).#@70|
|00003e20| 20 44 69 73 70 6c 61 79 | 20 64 69 66 66 65 72 65 | Display| differe|
|00003e30| 6e 63 65 73 20 61 6d 6f | 6e 67 20 74 68 65 20 64 |nces amo|ng the d|
|00003e40| 69 72 65 63 74 6f 72 69 | 65 73 20 69 6e 76 6f 6c |irectori|es invol|
|00003e50| 76 65 64 20 69 6e 20 73 | 65 73 73 69 6f 6e 20 67 |ved in s|ession g|
|00003e60| 72 6f 75 70 2e 1f 0a 28 | 64 65 66 61 6c 69 61 73 |roup...(|defalias|
|00003e70| 20 27 65 64 69 66 66 2d | 73 68 6f 77 2d 64 69 72 | 'ediff-|show-dir|
|00003e80| 2d 64 69 66 66 73 20 23 | 5b 6e 69 6c 20 22 c0 19 |-diffs #|[nil "..|
|00003e90| c0 89 19 86 09 00 5c 6e | c3 3e 29 86 19 00 09 89 |......\n|.>).....|
|00003ea0| 19 86 16 00 5c 6e c4 3e | 29 29 83 21 00 c5 c6 21 |....\n.>|)).!...!|
|00003eb0| 88 0e 07 83 36 00 c8 0e | 07 21 83 36 00 c9 c8 0e |....6...|.!.6....|
|00003ec0| 07 21 21 84 3b 00 ca 0e | 0b 21 88 0e 07 1e 5c 66 |.!!.;...|.!....\f|
|00003ed0| cd ce 21 88 cf d0 20 0e | 5c 66 5c 22 88 65 62 29 |..!... .|\f\".eb)|
|00003ee0| 87 22 20 5b 6e 69 6c 20 | 6d 65 74 61 6a 6f 62 20 |." [nil |metajob |
|00003ef0| 65 64 69 66 66 2d 6d 65 | 74 61 6a 6f 62 2d 6e 61 |ediff-me|tajob-na|
|00003f00| 6d 65 20 28 65 64 69 66 | 66 2d 64 69 72 65 63 74 |me (edif|f-direct|
|00003f10| 6f 72 79 2d 72 65 76 69 | 73 69 6f 6e 73 20 65 64 |ory-revi|sions ed|
|00003f20| 69 66 66 2d 6d 65 72 67 | 65 2d 64 69 72 65 63 74 |iff-merg|e-direct|
|00003f30| 6f 72 79 2d 72 65 76 69 | 73 69 6f 6e 73 20 65 64 |ory-revi|sions ed|
|00003f40| 69 66 66 2d 6d 65 72 67 | 65 2d 64 69 72 65 63 74 |iff-merg|e-direct|
|00003f50| 6f 72 79 2d 72 65 76 69 | 73 69 6f 6e 73 2d 77 69 |ory-revi|sions-wi|
|00003f60| 74 68 2d 61 6e 63 65 73 | 74 6f 72 29 20 28 65 64 |th-ances|tor) (ed|
|00003f70| 69 66 66 2d 6d 75 6c 74 | 69 66 69 6c 65 2d 70 61 |iff-mult|ifile-pa|
|00003f80| 74 63 68 29 20 65 72 72 | 6f 72 20 22 54 68 69 73 |tch) err|or "This|
|00003f90| 20 63 6f 6d 6d 61 6e 64 | 20 69 73 20 69 6e 61 70 | command| is inap|
|00003fa0| 70 6c 69 63 61 62 6c 65 | 20 69 6e 20 74 68 65 20 |plicable| in the |
|00003fb0| 70 72 65 73 65 6e 74 20 | 63 6f 6e 74 65 78 74 22 |present |context"|
|00003fc0| 20 65 64 69 66 66 2d 64 | 69 72 2d 64 69 66 66 73 | ediff-d|ir-diffs|
|00003fd0| 2d 62 75 66 66 65 72 20 | 67 65 74 2d 62 75 66 66 |-buffer |get-buff|
|00003fe0| 65 72 20 62 75 66 66 65 | 72 2d 6e 61 6d 65 20 65 |er buffe|r-name e|
|00003ff0| 64 69 66 66 2d 64 72 61 | 77 2d 64 69 72 2d 64 69 |diff-dra|w-dir-di|
|00004000| 66 66 73 20 65 64 69 66 | 66 2d 64 69 72 2d 64 69 |ffs edif|f-dir-di|
|00004010| 66 66 65 72 65 6e 63 65 | 2d 6c 69 73 74 20 62 75 |fference|-list bu|
|00004020| 66 20 6f 74 68 65 72 2d | 77 69 6e 64 6f 77 20 31 |f other-|window 1|
|00004030| 20 73 65 74 2d 77 69 6e | 64 6f 77 2d 62 75 66 66 | set-win|dow-buff|
|00004040| 65 72 20 73 65 6c 65 63 | 74 65 64 2d 77 69 6e 64 |er selec|ted-wind|
|00004050| 6f 77 5d 20 33 20 28 23 | 24 20 2e 20 31 35 39 30 |ow] 3 (#|$ . 1590|
|00004060| 35 29 20 6e 69 6c 5d 29 | 0a 23 40 34 30 20 47 6f |5) nil])|.#@40 Go|
|00004070| 20 74 6f 20 74 68 65 20 | 70 61 72 65 6e 74 20 73 | to the |parent s|
|00004080| 65 73 73 69 6f 6e 20 67 | 72 6f 75 70 20 62 75 66 |ession g|roup buf|
|00004090| 66 65 72 2e 1f 0a 28 64 | 65 66 61 6c 69 61 73 20 |fer...(d|efalias |
|000040a0| 27 65 64 69 66 66 2d 75 | 70 2d 6d 65 74 61 2d 68 |'ediff-u|p-meta-h|
|000040b0| 69 65 72 61 72 63 68 79 | 20 23 5b 6e 69 6c 20 22 |ierarchy| #[nil "|
|000040c0| 08 83 16 00 c1 08 21 83 | 16 00 c2 c1 08 21 21 83 |......!.|.....!!.|
|000040d0| 16 00 c3 08 21 87 c4 c5 | 21 87 22 20 5b 65 64 69 |....!...|!." [edi|
|000040e0| 66 66 2d 70 61 72 65 6e | 74 2d 6d 65 74 61 2d 62 |ff-paren|t-meta-b|
|000040f0| 75 66 66 65 72 20 67 65 | 74 2d 62 75 66 66 65 72 |uffer ge|t-buffer|
|00004100| 20 62 75 66 66 65 72 2d | 6e 61 6d 65 20 65 64 69 | buffer-|name edi|
|00004110| 66 66 2d 73 68 6f 77 2d | 6d 65 74 61 2d 62 75 66 |ff-show-|meta-buf|
|00004120| 66 65 72 20 65 72 72 6f | 72 20 22 54 68 69 73 20 |fer erro|r "This |
|00004130| 73 65 73 73 69 6f 6e 20 | 67 72 6f 75 70 20 68 61 |session |group ha|
|00004140| 73 20 6e 6f 20 70 61 72 | 65 6e 74 22 5d 20 33 20 |s no par|ent"] 3 |
|00004150| 28 23 24 20 2e 20 31 36 | 34 39 34 29 20 6e 69 6c |(#$ . 16|494) nil|
|00004160| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00004170| 69 66 66 2d 72 65 64 72 | 61 77 2d 72 65 67 69 73 |iff-redr|aw-regis|
|00004180| 74 72 79 2d 62 75 66 66 | 65 72 20 23 5b 28 26 6f |try-buff|er #[(&o|
|00004190| 70 74 69 6f 6e 61 6c 20 | 69 67 6e 6f 72 65 29 20 |ptional |ignore) |
|000041a0| 22 70 18 09 83 03 02 c2 | 09 21 83 03 02 c3 c2 09 |"p......|.!......|
|000041b0| 21 21 83 03 02 c4 8e 09 | 71 88 60 c5 89 89 89 89 |!!......|q.`.....|
|000041c0| 89 89 89 89 89 89 1e 06 | 1e 07 1e 08 1e 09 1e 5c |........|.......\|
|000041d0| 6e 1e 0b 1e 5c 66 1e 0d | 1e 0e 1e 0f 1e 10 1e 11 |n...\f..|........|
|000041e0| d2 20 88 d3 63 88 d4 d5 | 0e 16 5c 22 88 0e 16 84 |. ..c...|..\"....|
|000041f0| 51 00 d7 63 88 0e 16 16 | 07 0e 07 83 f7 01 0e 07 |Q..c....|........|
|00004200| 40 16 10 0e 07 41 16 07 | 0e 10 83 55 00 c2 0e 10 |@....A..|...U....|
|00004210| 21 83 55 00 c3 c2 0e 10 | 21 21 83 55 00 70 18 0e |!.U.....|!!.U.p..|
|00004220| 10 83 ac 00 c2 0e 10 21 | 83 ac 00 c3 c2 0e 10 21 |.......!|.......!|
|00004230| 21 83 ac 00 d8 8e 0e 10 | 71 88 0e 19 16 09 0e 1a |!.......|q.......|
|00004240| 16 08 0e 19 85 a8 00 0e | 19 db 3d 3f 29 82 b7 00 |........|..=?)...|
|00004250| 0e 1c dd 3d 86 b7 00 de | 0e 1f 21 29 83 05 01 60 |...=....|..!)...`|
|00004260| 16 5c 6e e0 e1 c3 0e 10 | 21 e2 0e 09 21 23 63 88 |.\n.....|!...!#c.|
|00004270| e0 e3 e4 e5 0e 08 21 21 | e4 e6 0e 08 21 3b 83 e3 |......!!|....!;..|
|00004280| 00 e6 0e 08 21 82 e4 00 | e7 21 e4 e8 0e 08 21 3b |....!...|.!....!;|
|00004290| 83 f5 00 e8 0e 08 21 82 | f6 00 e7 21 24 63 88 e9 |......!.|...!$c..|
|000042a0| 0e 5c 6e 60 0e 10 23 88 | 82 55 00 70 18 0e 10 83 |.\n`..#.|.U.p....|
|000042b0| bb 01 c2 0e 10 21 83 bb | 01 c3 c2 0e 10 21 21 83 |.....!..|.....!!.|
|000042c0| bb 01 ea 8e 0e 10 71 88 | 0e 2b 83 3e 01 c2 0e 2b |......q.|.+.>...+|
|000042d0| 21 83 3e 01 c3 c2 0e 2b | 21 21 83 3e 01 c3 0e 2b |!.>....+|!!.>...+|
|000042e0| 21 82 3f 01 ec 16 0f 0e | 2d 83 5d 01 c2 0e 2d 21 |!.?.....|-.]...-!|
|000042f0| 83 5d 01 c3 c2 0e 2d 21 | 21 83 5d 01 c3 0e 2d 21 |.]....-!|!.]...-!|
|00004300| 82 5e 01 ec 16 0e 0e 2e | 84 6e 01 0e 2f 84 6e 01 |.^......|.n../.n.|
|00004310| e7 82 8b 01 0e 30 83 8a | 01 c2 0e 30 21 83 8a 01 |.....0..|...0!...|
|00004320| c3 c2 0e 30 21 21 83 8a | 01 c3 0e 30 21 82 8b 01 |...0!!..|...0!...|
|00004330| ec 16 0d e0 f1 0e 32 5c | 22 16 0b 0e 33 f4 55 83 |......2\|"...3.U.|
|00004340| 9f 01 f5 82 b1 01 0e 33 | 0e 32 55 83 ab 01 f6 82 |.......3|.2U.....|
|00004350| b1 01 e0 f7 0e 33 54 5c | 22 16 5c 66 0e 38 16 09 |.....3T\|".\f.8..|
|00004360| 29 82 c7 01 0e 1c dd 3d | 84 c7 01 de 0e 1f 21 88 |)......=|......!.|
|00004370| 29 60 16 5c 6e 0e 5c 66 | f9 0e 0b fa c3 0e 10 21 |)`.\n.\f|.......!|
|00004380| e0 fb e2 0e 09 21 5c 22 | b1 06 88 fc 0e 0f fd 0e |.....!\"|........|
|00004390| 0e fd 0e 0d fe b1 07 88 | e9 0e 5c 6e 60 0e 10 23 |........|..\n`..#|
|000043a0| 88 82 55 00 ff c5 21 88 | 0e 11 62 2e 0d 82 0e 02 |..U...!.|..b.....|
|000043b0| 0e 1c dd 3d 86 0e 02 de | 0e 1f 21 29 87 22 20 5b |...=....|..!)." [|
|000043c0| 53 74 61 72 74 42 75 66 | 66 65 72 20 65 64 69 66 |StartBuf|fer edif|
|000043d0| 66 2d 72 65 67 69 73 74 | 72 79 2d 62 75 66 66 65 |f-regist|ry-buffe|
|000043e0| 72 20 67 65 74 2d 62 75 | 66 66 65 72 20 62 75 66 |r get-bu|ffer buf|
|000043f0| 66 65 72 2d 6e 61 6d 65 | 20 28 28 73 65 74 2d 62 |fer-name| ((set-b|
|00004400| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00004410| 72 29 29 20 6e 69 6c 20 | 62 75 66 66 65 72 2d 72 |r)) nil |buffer-r|
|00004420| 65 61 64 2d 6f 6e 6c 79 | 20 72 65 67 69 73 74 72 |ead-only| registr|
|00004430| 79 2d 6c 69 73 74 20 6d | 65 74 61 2d 6c 69 73 74 |y-list m|eta-list|
|00004440| 20 6a 6f 62 2d 6e 61 6d | 65 20 70 74 20 74 6f 74 | job-nam|e pt tot|
|00004450| 61 6c 2d 64 69 66 66 73 | 20 63 75 72 2d 64 69 66 |al-diffs| cur-dif|
|00004460| 66 20 62 75 66 43 6e 61 | 6d 65 20 62 75 66 42 6e |f bufCna|me bufBn|
|00004470| 61 6d 65 20 62 75 66 41 | 6e 61 6d 65 20 65 6c 74 |ame bufA|name elt|
|00004480| 20 70 6f 69 6e 74 20 65 | 72 61 73 65 2d 62 75 66 | point e|rase-buf|
|00004490| 66 65 72 20 22 54 68 69 | 73 20 69 73 20 61 20 72 |fer "Thi|s is a r|
|000044a0| 65 67 69 73 74 72 79 20 | 6f 66 20 61 6c 6c 20 61 |egistry |of all a|
|000044b0| 63 74 69 76 65 20 45 64 | 69 66 66 20 73 65 73 73 |ctive Ed|iff sess|
|000044c0| 69 6f 6e 73 2e 5c 6e 5c | 6e 55 73 65 66 75 6c 20 |ions.\n\|nUseful |
|000044d0| 63 6f 6d 6d 61 6e 64 73 | 3a 5c 6e 20 20 20 20 20 |commands|:\n     |
|000044e0| 62 75 74 74 6f 6e 32 2c | 20 60 76 27 2c 20 52 45 |button2,| `v', RE|
|000044f0| 54 20 6f 76 65 72 20 61 | 20 73 65 73 73 69 6f 6e |T over a| session|
|00004500| 20 72 65 63 6f 72 64 3a | 20 20 73 77 69 74 63 68 | record:|  switch|
|00004510| 20 74 6f 20 74 68 61 74 | 20 73 65 73 73 69 6f 6e | to that| session|
|00004520| 5c 6e 20 20 20 20 20 60 | 4d 27 20 6f 76 65 72 20 |\n     `|M' over |
|00004530| 61 20 73 65 73 73 69 6f | 6e 20 72 65 63 6f 72 64 |a sessio|n record|
|00004540| 3a 20 20 64 69 73 70 6c | 61 79 20 74 68 65 20 61 |:  displ|ay the a|
|00004550| 73 73 6f 63 69 61 74 65 | 64 20 73 65 73 73 69 6f |ssociate|d sessio|
|00004560| 6e 20 67 72 6f 75 70 5c | 6e 20 20 20 20 20 60 52 |n group\|n     `R|
|00004570| 27 20 69 6e 20 61 6e 79 | 20 45 64 69 66 66 20 73 |' in any| Ediff s|
|00004580| 65 73 73 69 6f 6e 3a 20 | 20 20 64 69 73 70 6c 61 |ession: |  displa|
|00004590| 79 20 73 65 73 73 69 6f | 6e 20 72 65 67 69 73 74 |y sessio|n regist|
|000045a0| 72 79 5c 6e 20 20 20 20 | 20 53 50 43 3a 09 6e 65 |ry\n    | SPC:.ne|
|000045b0| 78 74 20 73 65 73 73 69 | 6f 6e 5c 6e 20 20 20 20 |xt sessi|on\n    |
|000045c0| 20 44 45 4c 3a 09 70 72 | 65 76 69 6f 75 73 20 73 | DEL:.pr|evious s|
|000045d0| 65 73 73 69 6f 6e 5c 6e | 20 20 20 20 20 60 45 27 |ession\n|     `E'|
|000045e0| 3a 09 62 72 6f 77 73 65 | 20 45 64 69 66 66 20 6f |:.browse| Ediff o|
|000045f0| 6e 2d 6c 69 6e 65 20 6d | 61 6e 75 61 6c 5c 6e 20 |n-line m|anual\n |
|00004600| 20 20 20 20 60 71 27 3a | 09 62 75 72 79 20 72 65 |    `q':|.bury re|
|00004610| 67 69 73 74 72 79 5c 6e | 5c 6e 5c 6e 09 09 41 63 |gistry\n|\n\n..Ac|
|00004620| 74 69 76 65 20 45 64 69 | 66 66 20 53 65 73 73 69 |tive Edi|ff Sessi|
|00004630| 6f 6e 73 3a 5c 6e 09 09 | 2d 2d 2d 2d 2d 2d 2d 2d |ons:\n..|--------|
|00004640| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 5c 6e |--------|------\n|
|00004650| 5c 6e 22 20 6d 61 70 63 | 61 72 20 23 5b 28 65 6c |\n" mapc|ar #[(el|
|00004660| 74 29 20 22 08 85 0f 00 | c1 08 21 85 0f 00 c2 c1 |t) "....|..!.....|
|00004670| 08 21 21 3f 85 19 00 c3 | 08 5c 66 5c 22 89 14 87 |.!!?....|.\f\"...|
|00004680| 22 20 5b 65 6c 74 20 67 | 65 74 2d 62 75 66 66 65 |" [elt g|et-buffe|
|00004690| 72 20 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 64 65 |r buffer|-name de|
|000046a0| 6c 71 20 65 64 69 66 66 | 2d 73 65 73 73 69 6f 6e |lq ediff|-session|
|000046b0| 2d 72 65 67 69 73 74 72 | 79 5d 20 33 5d 20 65 64 |-registr|y] 3] ed|
|000046c0| 69 66 66 2d 73 65 73 73 | 69 6f 6e 2d 72 65 67 69 |iff-sess|ion-regi|
|000046d0| 73 74 72 79 20 22 20 20 | 20 20 20 20 20 2a 2a 2a |stry "  |     ***|
|000046e0| 2a 2a 2a 2a 20 4e 6f 20 | 61 63 74 69 76 65 20 45 |**** No |active E|
|000046f0| 64 69 66 66 20 73 65 73 | 73 69 6f 6e 73 20 2a 2a |diff ses|sions **|
|00004700| 2a 2a 2a 2a 2a 5c 6e 22 | 20 28 28 73 65 74 2d 62 |*****\n"| ((set-b|
|00004710| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00004720| 72 29 29 20 65 64 69 66 | 66 2d 6d 65 74 61 6a 6f |r)) edif|f-metajo|
|00004730| 62 2d 6e 61 6d 65 20 65 | 64 69 66 66 2d 6d 65 74 |b-name e|diff-met|
|00004740| 61 2d 6c 69 73 74 20 65 | 64 69 66 66 2d 72 65 67 |a-list e|diff-reg|
|00004750| 69 73 74 72 79 20 74 68 | 69 73 2d 63 6f 6d 6d 61 |istry th|is-comma|
|00004760| 6e 64 20 65 64 69 66 66 | 2d 71 75 69 74 20 65 72 |nd ediff|-quit er|
|00004770| 72 6f 72 20 65 64 69 66 | 66 2d 4b 49 4c 4c 45 44 |ror edif|f-KILLED|
|00004780| 2d 56 49 54 41 4c 2d 42 | 55 46 46 45 52 20 66 6f |-VITAL-B|UFFER fo|
|00004790| 72 6d 61 74 20 22 20 20 | 2a 67 72 6f 75 70 2a 09 |rmat "  |*group*.|
|000047a0| 25 73 3a 20 25 73 5c 6e | 22 20 65 64 69 66 66 2d |%s: %s\n|" ediff-|
|000047b0| 61 62 62 72 65 76 2d 6a | 6f 62 6e 61 6d 65 20 22 |abbrev-j|obname "|
|000047c0| 09 09 20 20 20 25 73 20 | 20 20 25 73 20 20 20 25 |..   %s |  %s   %|
|000047d0| 73 5c 6e 22 20 65 64 69 | 66 66 2d 61 62 62 72 65 |s\n" edi|ff-abbre|
|000047e0| 76 69 61 74 65 2d 66 69 | 6c 65 2d 6e 61 6d 65 20 |viate-fi|le-name |
|000047f0| 65 64 69 66 66 2d 67 65 | 74 2d 67 72 6f 75 70 2d |ediff-ge|t-group-|
|00004800| 6f 62 6a 41 20 65 64 69 | 66 66 2d 67 65 74 2d 67 |objA edi|ff-get-g|
|00004810| 72 6f 75 70 2d 6f 62 6a | 42 20 22 22 20 65 64 69 |roup-obj|B "" edi|
|00004820| 66 66 2d 67 65 74 2d 67 | 72 6f 75 70 2d 6f 62 6a |ff-get-g|roup-obj|
|00004830| 43 20 65 64 69 66 66 2d | 73 65 74 2d 6d 65 74 61 |C ediff-|set-meta|
|00004840| 2d 6f 76 65 72 6c 61 79 | 20 28 28 73 65 74 2d 62 |-overlay| ((set-b|
|00004850| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00004860| 72 29 29 20 65 64 69 66 | 66 2d 62 75 66 66 65 72 |r)) edif|f-buffer|
|00004870| 2d 41 20 22 21 21 21 6b | 69 6c 6c 65 64 20 62 75 |-A "!!!k|illed bu|
|00004880| 66 66 65 72 21 21 21 22 | 20 65 64 69 66 66 2d 62 |ffer!!!"| ediff-b|
|00004890| 75 66 66 65 72 2d 42 20 | 65 64 69 66 66 2d 33 77 |uffer-B |ediff-3w|
|000048a0| 61 79 2d 63 6f 6d 70 61 | 72 69 73 6f 6e 2d 6a 6f |ay-compa|rison-jo|
|000048b0| 62 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 6a 6f |b ediff-|merge-jo|
|000048c0| 62 20 65 64 69 66 66 2d | 62 75 66 66 65 72 2d 43 |b ediff-|buffer-C|
|000048d0| 20 22 25 2d 34 64 22 20 | 65 64 69 66 66 2d 6e 75 | "%-4d" |ediff-nu|
|000048e0| 6d 62 65 72 2d 6f 66 2d | 64 69 66 66 65 72 65 6e |mber-of-|differen|
|000048f0| 63 65 73 20 65 64 69 66 | 66 2d 63 75 72 72 65 6e |ces edif|f-curren|
|00004900| 74 2d 64 69 66 66 65 72 | 65 6e 63 65 20 2d 31 20 |t-differ|ence -1 |
|00004910| 22 20 20 20 5f 22 20 22 | 20 20 20 24 22 20 22 25 |"   _" "|   $" "%|
|00004920| 34 64 22 20 65 64 69 66 | 66 2d 6a 6f 62 2d 6e 61 |4d" edif|f-job-na|
|00004930| 6d 65 20 22 2f 22 20 22 | 09 22 20 22 3a 20 25 73 |me "/" "|." ": %s|
|00004940| 22 20 22 5c 6e 09 09 20 | 20 20 22 20 22 20 20 20 |" "\n.. |  " "   |
|00004950| 22 20 22 5c 6e 22 20 73 | 65 74 2d 62 75 66 66 65 |" "\n" s|et-buffe|
|00004960| 72 2d 6d 6f 64 69 66 69 | 65 64 2d 70 5d 20 31 32 |r-modifi|ed-p] 12|
|00004970| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00004980| 69 66 66 2d 73 65 74 2d | 6d 65 74 61 2d 6f 76 65 |iff-set-|meta-ove|
|00004990| 72 6c 61 79 20 23 5b 28 | 62 20 65 20 70 72 6f 70 |rlay #[(|b e prop|
|000049a0| 29 20 22 c0 19 c2 0b 5c | 66 5c 22 11 0d 83 14 00 |) "....\|f\".....|
|000049b0| c6 09 c7 c8 23 88 82 1a | 00 c6 09 c8 c9 23 88 c6 |....#...|.....#..|
|000049c0| 09 ca 0e 0b 23 29 87 22 | 20 5b 6e 69 6c 20 6f 76 |....#)."| [nil ov|
|000049d0| 65 72 6c 20 65 64 69 66 | 66 2d 6d 61 6b 65 2d 6f |erl edif|f-make-o|
|000049e0| 76 65 72 6c 61 79 20 62 | 20 65 20 65 64 69 66 66 |verlay b| e ediff|
|000049f0| 2d 65 6d 61 63 73 2d 70 | 20 65 64 69 66 66 2d 6f |-emacs-p| ediff-o|
|00004a00| 76 65 72 6c 61 79 2d 70 | 75 74 20 6d 6f 75 73 65 |verlay-p|ut mouse|
|00004a10| 2d 66 61 63 65 20 68 69 | 67 68 6c 69 67 68 74 20 |-face hi|ghlight |
|00004a20| 74 20 65 64 69 66 66 2d | 6d 65 74 61 2d 69 6e 66 |t ediff-|meta-inf|
|00004a30| 6f 20 70 72 6f 70 5d 20 | 34 5d 29 0a 23 40 35 31 |o prop] |4]).#@51|
|00004a40| 20 4d 61 72 6b 20 73 65 | 73 73 69 6f 6e 20 66 6f | Mark se|ssion fo|
|00004a50| 72 20 68 69 64 69 6e 67 | 2e 20 57 69 74 68 20 70 |r hiding|. With p|
|00004a60| 72 65 66 69 78 20 61 72 | 67 2c 20 75 6e 6d 61 72 |refix ar|g, unmar|
|00004a70| 6b 2e 1f 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |k...(def|alias 'e|
|00004a80| 64 69 66 66 2d 6d 61 72 | 6b 2d 66 6f 72 2d 68 69 |diff-mar|k-for-hi|
|00004a90| 64 69 6e 67 20 23 5b 28 | 75 6e 6d 61 72 6b 29 20 |ding #[(|unmark) |
|00004aa0| 22 c0 09 21 1a c3 09 21 | 1c c5 5c 66 5c 6e 5c 22 |"..!...!|..\f\n\"|
|00004ab0| 1e 06 c7 0e 06 21 1e 08 | c9 0e 06 21 ca 3d 83 20 |.....!..|...!.=. |
|00004ac0| 00 cb 16 5c 66 0e 5c 66 | 83 2e 00 cd 0e 06 ce 5c |...\f.\f|.......\|
|00004ad0| 22 88 82 51 00 0e 08 83 | 4b 00 cf 0e 08 21 83 4b |"..Q....|K....!.K|
|00004ae0| 00 d0 cf 0e 08 21 21 83 | 4b 00 d1 d2 d0 0e 08 21 |.....!!.|K......!|
|00004af0| 5c 22 88 cd 0e 06 ca 5c | 22 88 0e 5c 66 84 5a 00 |\".....\|"..\f.Z.|
|00004b00| d3 d4 21 88 d5 5c 66 21 | 2c 87 22 20 5b 65 64 69 |..!..\f!|,." [edi|
|00004b10| 66 66 2d 65 76 65 6e 74 | 2d 70 6f 69 6e 74 20 6c |ff-event|-point l|
|00004b20| 61 73 74 2d 63 6f 6d 6d | 61 6e 64 2d 65 76 65 6e |ast-comm|and-even|
|00004b30| 74 20 70 6f 73 20 65 64 | 69 66 66 2d 65 76 65 6e |t pos ed|iff-even|
|00004b40| 74 2d 62 75 66 66 65 72 | 20 6d 65 74 61 2d 62 75 |t-buffer| meta-bu|
|00004b50| 66 20 65 64 69 66 66 2d | 67 65 74 2d 6d 65 74 61 |f ediff-|get-meta|
|00004b60| 2d 69 6e 66 6f 20 69 6e | 66 6f 20 65 64 69 66 66 |-info in|fo ediff|
|00004b70| 2d 67 65 74 2d 73 65 73 | 73 69 6f 6e 2d 62 75 66 |-get-ses|sion-buf|
|00004b80| 66 65 72 20 73 65 73 73 | 69 6f 6e 2d 62 75 66 20 |fer sess|ion-buf |
|00004b90| 65 64 69 66 66 2d 67 65 | 74 2d 73 65 73 73 69 6f |ediff-ge|t-sessio|
|00004ba0| 6e 2d 73 74 61 74 75 73 | 20 37 32 20 74 20 75 6e |n-status| 72 t un|
|00004bb0| 6d 61 72 6b 20 65 64 69 | 66 66 2d 73 65 74 2d 73 |mark edi|ff-set-s|
|00004bc0| 65 73 73 69 6f 6e 2d 73 | 74 61 74 75 73 20 6e 69 |ession-s|tatus ni|
|00004bd0| 6c 20 67 65 74 2d 62 75 | 66 66 65 72 20 62 75 66 |l get-bu|ffer buf|
|00004be0| 66 65 72 2d 6e 61 6d 65 | 20 65 72 72 6f 72 20 22 |fer-name| error "|
|00004bf0| 43 61 6e 27 74 20 68 69 | 64 65 20 61 63 74 69 76 |Can't hi|de activ|
|00004c00| 65 20 73 65 73 73 69 6f | 6e 2c 20 25 73 22 20 65 |e sessio|n, %s" e|
|00004c10| 64 69 66 66 2d 6e 65 78 | 74 2d 6d 65 74 61 2d 69 |diff-nex|t-meta-i|
|00004c20| 74 65 6d 20 31 20 65 64 | 69 66 66 2d 75 70 64 61 |tem 1 ed|iff-upda|
|00004c30| 74 65 2d 6d 65 74 61 2d | 62 75 66 66 65 72 5d 20 |te-meta-|buffer] |
|00004c40| 34 20 28 23 24 20 2e 20 | 31 39 30 30 39 29 20 22 |4 (#$ . |19009) "|
|00004c50| 50 22 5d 29 0a 23 40 36 | 32 20 4d 61 72 6b 20 73 |P"]).#@6|2 Mark s|
|00004c60| 65 73 73 69 6f 6e 20 66 | 6f 72 20 61 20 67 72 6f |ession f|or a gro|
|00004c70| 75 70 20 6f 70 65 72 61 | 74 69 6f 6e 2e 20 57 69 |up opera|tion. Wi|
|00004c80| 74 68 20 70 72 65 66 69 | 78 20 61 72 67 2c 20 75 |th prefi|x arg, u|
|00004c90| 6e 6d 61 72 6b 2e 1f 0a | 28 64 65 66 61 6c 69 61 |nmark...|(defalia|
|00004ca0| 73 20 27 65 64 69 66 66 | 2d 6d 61 72 6b 2d 66 6f |s 'ediff|-mark-fo|
|00004cb0| 72 2d 6f 70 65 72 61 74 | 69 6f 6e 20 23 5b 28 75 |r-operat|ion #[(u|
|00004cc0| 6e 6d 61 72 6b 29 20 22 | c0 09 21 1a c3 09 21 1c |nmark) "|..!...!.|
|00004cd0| c5 5c 66 5c 6e 5c 22 1e | 06 c7 0e 06 21 c8 3d 83 |.\f\n\".|....!.=.|
|00004ce0| 1a 00 c9 16 5c 6e 0e 5c | 6e 83 28 00 cb 0e 06 cc |....\n.\|n.(.....|
|00004cf0| 5c 22 88 82 2e 00 cb 0e | 06 c8 5c 22 88 0e 5c 6e |\"......|..\"..\n|
|00004d00| 84 37 00 cd ce 21 88 cf | 5c 66 21 2b 87 22 20 5b |.7...!..|\f!+." [|
|00004d10| 65 64 69 66 66 2d 65 76 | 65 6e 74 2d 70 6f 69 6e |ediff-ev|ent-poin|
|00004d20| 74 20 6c 61 73 74 2d 63 | 6f 6d 6d 61 6e 64 2d 65 |t last-c|ommand-e|
|00004d30| 76 65 6e 74 20 70 6f 73 | 20 65 64 69 66 66 2d 65 |vent pos| ediff-e|
|00004d40| 76 65 6e 74 2d 62 75 66 | 66 65 72 20 6d 65 74 61 |vent-buf|fer meta|
|00004d50| 2d 62 75 66 20 65 64 69 | 66 66 2d 67 65 74 2d 6d |-buf edi|ff-get-m|
|00004d60| 65 74 61 2d 69 6e 66 6f | 20 69 6e 66 6f 20 65 64 |eta-info| info ed|
|00004d70| 69 66 66 2d 67 65 74 2d | 73 65 73 73 69 6f 6e 2d |iff-get-|session-|
|00004d80| 73 74 61 74 75 73 20 34 | 32 20 74 20 75 6e 6d 61 |status 4|2 t unma|
|00004d90| 72 6b 20 65 64 69 66 66 | 2d 73 65 74 2d 73 65 73 |rk ediff|-set-ses|
|00004da0| 73 69 6f 6e 2d 73 74 61 | 74 75 73 20 6e 69 6c 20 |sion-sta|tus nil |
|00004db0| 65 64 69 66 66 2d 6e 65 | 78 74 2d 6d 65 74 61 2d |ediff-ne|xt-meta-|
|00004dc0| 69 74 65 6d 20 31 20 65 | 64 69 66 66 2d 75 70 64 |item 1 e|diff-upd|
|00004dd0| 61 74 65 2d 6d 65 74 61 | 2d 62 75 66 66 65 72 5d |ate-meta|-buffer]|
|00004de0| 20 33 20 28 23 24 20 2e | 20 31 39 35 34 36 29 20 | 3 (#$ .| 19546) |
|00004df0| 22 50 22 5d 29 0a 23 40 | 34 38 20 48 69 64 65 20 |"P"]).#@|48 Hide |
|00004e00| 6d 61 72 6b 65 64 20 73 | 65 73 73 69 6f 6e 73 2e |marked s|essions.|
|00004e10| 20 57 69 74 68 20 70 72 | 65 66 69 78 20 61 72 67 | With pr|efix arg|
|00004e20| 2c 20 75 6e 68 69 64 65 | 2e 1f 0a 28 64 65 66 61 |, unhide|...(defa|
|00004e30| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 68 69 64 65 |lias 'ed|iff-hide|
|00004e40| 2d 6d 61 72 6b 65 64 2d | 73 65 73 73 69 6f 6e 73 |-marked-|sessions|
|00004e50| 20 23 5b 28 75 6e 68 69 | 64 65 29 20 22 c0 09 21 | #[(unhi|de) "..!|
|00004e60| 09 41 5c 6e 83 0d 00 c3 | 82 0e 00 c4 5c 6e 83 16 |.A\n....|....\n..|
|00004e70| 00 c4 82 17 00 c3 c5 c6 | 89 89 1e 07 1e 08 1e 09 |........|........|
|00004e80| 1e 5c 6e 1e 0b 1e 5c 66 | 1e 0d 1e 0e 0e 0d 83 6d |.\n...\f|.......m|
|00004e90| 00 0e 0d 40 16 07 0e 0d | 41 16 0d cf 0e 07 21 16 |...@....|A.....!.|
|00004ea0| 08 d0 0e 07 21 0e 5c 66 | 3d 83 2b 00 0e 5c 6e 54 |....!.\f|=.+..\nT|
|00004eb0| 16 5c 6e 0e 0b c3 3d 83 | 63 00 d1 0e 08 21 83 63 |.\n...=.|c....!.c|
|00004ec0| 00 d2 16 09 82 2b 00 d3 | 0e 07 0e 0b 5c 22 88 82 |.....+..|....\"..|
|00004ed0| 2b 00 0e 5c 6e c5 56 83 | 7c 00 d4 0e 0e 21 88 82 |+..\n.V.||....!..|
|00004ee0| 8e 00 d5 20 88 5c 6e 83 | 8a 00 d6 d7 21 88 82 8e |... .\n.|....!...|
|00004ef0| 00 d6 d8 21 88 0e 09 85 | 96 00 d6 d9 21 2e 08 87 |...!....|....!...|
|00004f00| 22 20 5b 65 64 69 66 66 | 2d 67 65 74 2d 67 72 6f |" [ediff|-get-gro|
|00004f10| 75 70 2d 62 75 66 66 65 | 72 20 65 64 69 66 66 2d |up-buffe|r ediff-|
|00004f20| 6d 65 74 61 2d 6c 69 73 | 74 20 75 6e 68 69 64 65 |meta-lis|t unhide|
|00004f30| 20 37 33 20 37 32 20 30 | 20 6e 69 6c 20 65 6c 74 | 73 72 0| nil elt|
|00004f40| 20 73 65 73 73 69 6f 6e | 2d 62 75 66 20 61 63 74 | session|-buf act|
|00004f50| 69 76 65 2d 73 65 73 73 | 69 6f 6e 73 2d 65 78 69 |ive-sess|ions-exi|
|00004f60| 73 74 20 6e 75 6d 4d 61 | 72 6b 65 64 20 74 6f 20 |st numMa|rked to |
|00004f70| 66 72 6f 6d 20 6d 65 74 | 61 2d 6c 69 73 74 20 67 |from met|a-list g|
|00004f80| 72 70 2d 62 75 66 20 65 | 64 69 66 66 2d 67 65 74 |rp-buf e|diff-get|
|00004f90| 2d 73 65 73 73 69 6f 6e | 2d 62 75 66 66 65 72 20 |-session|-buffer |
|00004fa0| 65 64 69 66 66 2d 67 65 | 74 2d 73 65 73 73 69 6f |ediff-ge|t-sessio|
|00004fb0| 6e 2d 73 74 61 74 75 73 | 20 62 75 66 66 65 72 2d |n-status| buffer-|
|00004fc0| 6c 69 76 65 2d 70 20 74 | 20 65 64 69 66 66 2d 73 |live-p t| ediff-s|
|00004fd0| 65 74 2d 73 65 73 73 69 | 6f 6e 2d 73 74 61 74 75 |et-sessi|on-statu|
|00004fe0| 73 20 65 64 69 66 66 2d | 75 70 64 61 74 65 2d 6d |s ediff-|update-m|
|00004ff0| 65 74 61 2d 62 75 66 66 | 65 72 20 62 65 65 70 20 |eta-buff|er beep |
|00005000| 6d 65 73 73 61 67 65 20 | 22 4e 6f 74 68 69 6e 67 |message |"Nothing|
|00005010| 20 74 6f 20 72 65 76 65 | 61 6c 2e 2e 2e 22 20 22 | to reve|al..." "|
|00005020| 4e 6f 74 68 69 6e 67 20 | 74 6f 20 68 69 64 65 2e |Nothing |to hide.|
|00005030| 2e 2e 22 20 22 4e 6f 74 | 65 3a 20 64 69 64 6e 27 |.." "Not|e: didn'|
|00005040| 74 20 68 69 64 65 20 61 | 63 74 69 76 65 20 73 65 |t hide a|ctive se|
|00005050| 73 73 69 6f 6e 73 21 22 | 5d 20 38 20 28 23 24 20 |ssions!"|] 8 (#$ |
|00005060| 2e 20 31 39 39 36 33 29 | 20 22 50 22 5d 29 0a 28 |. 19963)| "P"]).(|
|00005070| 64 65 66 61 6c 69 61 73 | 20 27 65 64 69 66 66 2d |defalias| 'ediff-|
|00005080| 6f 70 65 72 61 74 65 2d | 6f 6e 2d 6d 61 72 6b 65 |operate-|on-marke|
|00005090| 64 2d 73 65 73 73 69 6f | 6e 73 20 23 5b 28 6f 70 |d-sessio|ns #[(op|
|000050a0| 65 72 61 74 69 6f 6e 29 | 20 22 c0 09 21 09 41 c2 |eration)| "..!.A.|
|000050b0| c3 89 c4 1d 1e 06 1e 07 | 1e 08 1e 09 1e 5c 6e 0e |........|.....\n.|
|000050c0| 09 83 41 00 0e 09 40 15 | 0e 09 41 16 09 0e 06 54 |..A...@.|..A....T|
|000050d0| 16 06 cb 0d 21 0e 08 3d | 83 14 00 8a 0e 07 54 16 |....!..=|......T.|
|000050e0| 07 0e 5c 66 0d 0e 06 5c | 22 88 29 82 14 00 cd 0e |..\f...\|".).....|
|000050f0| 5c 6e 21 88 0e 07 2e 06 | 87 22 20 5b 65 64 69 66 |\n!.....|." [edif|
|00005100| 66 2d 67 65 74 2d 67 72 | 6f 75 70 2d 62 75 66 66 |f-get-gr|oup-buff|
|00005110| 65 72 20 65 64 69 66 66 | 2d 6d 65 74 61 2d 6c 69 |er ediff|-meta-li|
|00005120| 73 74 20 34 32 20 30 20 | 6e 69 6c 20 65 6c 74 20 |st 42 0 |nil elt |
|00005130| 73 65 73 73 69 6f 6e 4e | 75 6d 20 6e 75 6d 4d 61 |sessionN|um numMa|
|00005140| 72 6b 65 64 20 6d 61 72 | 6b 73 79 6d 20 6d 65 74 |rked mar|ksym met|
|00005150| 61 2d 6c 69 73 74 20 67 | 72 70 2d 62 75 66 20 65 |a-list g|rp-buf e|
|00005160| 64 69 66 66 2d 67 65 74 | 2d 73 65 73 73 69 6f 6e |diff-get|-session|
|00005170| 2d 73 74 61 74 75 73 20 | 6f 70 65 72 61 74 69 6f |-status |operatio|
|00005180| 6e 20 65 64 69 66 66 2d | 75 70 64 61 74 65 2d 6d |n ediff-|update-m|
|00005190| 65 74 61 2d 62 75 66 66 | 65 72 5d 20 36 5d 29 0a |eta-buff|er] 6]).|
|000051a0| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|000051b0| 2d 61 70 70 65 6e 64 2d | 63 75 73 74 6f 6d 2d 64 |-append-|custom-d|
|000051c0| 69 66 66 20 23 5b 28 73 | 65 73 73 69 6f 6e 20 73 |iff #[(s|ession s|
|000051d0| 65 73 73 69 6f 6e 4e 75 | 6d 29 20 22 c0 20 84 09 |essionNu|m) ". ..|
|000051e0| 00 c1 c2 21 88 c3 5c 66 | 21 0d 0e 06 c7 89 1e 08 |...!..\f|!.......|
|000051f0| 1e 09 1e 5c 6e 1e 0b 89 | 1e 5c 66 83 6d 00 cd 0e |...\n...|.\f.m...|
|00005200| 5c 66 21 83 6d 00 ce cd | 0e 5c 66 21 21 83 6d 00 |\f!.m...|.\f!!.m.|
|00005210| 70 1e 0f 0e 5c 66 83 60 | 00 cd 0e 5c 66 21 83 60 |p...\f.`|...\f!.`|
|00005220| 00 ce cd 0e 5c 66 21 21 | 83 60 00 d0 8e 0e 5c 66 |....\f!!|.`....\f|
|00005230| 71 88 0e 11 0e 5c 66 3d | 83 5c 5c 00 d2 20 88 0e |q....\f=|.\\.. ..|
|00005240| 13 16 08 29 82 6c 00 0e | 14 d5 3d 84 6c 00 c1 0e |...).l..|..=.l...|
|00005250| 16 21 88 29 0e 0b 83 82 | 00 cd 0e 0b 21 83 82 00 |.!.)....|....!...|
|00005260| ce cd 0e 0b 21 21 84 86 | 00 c1 d7 21 88 0e 08 83 |....!!..|...!....|
|00005270| ae 00 cd 0e 08 21 83 ae | 00 ce cd 0e 08 21 21 83 |.....!..|.....!!.|
|00005280| ae 00 8a 0e 0b 71 88 64 | 62 88 d8 0e 08 21 88 d9 |.....q.d|b....!..|
|00005290| 63 29 82 ec 00 0e 5c 6e | da 3e 83 e7 00 8a db 0e |c)....\n|.>......|
|000052a0| 1c 21 89 16 09 71 88 dd | 20 88 de df e0 0e 21 0e |.!...q..| .....!.|
|000052b0| 5c 22 e3 5c 66 21 e4 5c | 66 21 25 e5 5c 22 88 29 |\".\f!.\|f!%.\".)|
|000052c0| 8a 0e 0b 71 88 64 62 88 | d8 0e 09 21 88 d9 63 29 |...q.db.|...!..c)|
|000052d0| 82 ec 00 c1 e6 0e 27 5c | 22 2d 87 22 20 5b 65 64 |......'\|"-." [ed|
|000052e0| 69 66 66 2d 63 6f 6c 6c | 65 63 74 2d 64 69 66 66 |iff-coll|ect-diff|
|000052f0| 73 2d 6d 65 74 61 6a 6f | 62 20 65 72 72 6f 72 20 |s-metajo|b error |
|00005300| 22 53 6f 72 72 79 2c 20 | 49 20 64 6f 6e 27 74 20 |"Sorry, |I don't |
|00005310| 64 6f 20 74 68 69 73 20 | 66 6f 72 20 65 76 65 72 |do this |for ever|
|00005320| 79 6f 6e 65 2e 2e 2e 22 | 20 65 64 69 66 66 2d 67 |yone..."| ediff-g|
|00005330| 65 74 2d 73 65 73 73 69 | 6f 6e 2d 62 75 66 66 65 |et-sessi|on-buffe|
|00005340| 72 20 73 65 73 73 69 6f | 6e 20 65 64 69 66 66 2d |r sessio|n ediff-|
|00005350| 6d 65 74 61 2d 64 69 66 | 66 2d 62 75 66 66 65 72 |meta-dif|f-buffer|
|00005360| 20 65 64 69 66 66 2d 6d | 65 74 61 6a 6f 62 2d 6e | ediff-m|etajob-n|
|00005370| 61 6d 65 20 6e 69 6c 20 | 63 75 73 74 6f 6d 2d 64 |ame nil |custom-d|
|00005380| 69 66 66 2d 62 75 66 20 | 74 6d 70 2d 62 75 66 20 |iff-buf |tmp-buf |
|00005390| 6d 65 74 61 6a 6f 62 20 | 6d 65 74 61 2d 64 69 66 |metajob |meta-dif|
|000053a0| 66 2d 62 75 66 66 20 73 | 65 73 73 69 6f 6e 2d 62 |f-buff s|ession-b|
|000053b0| 75 66 20 67 65 74 2d 62 | 75 66 66 65 72 20 62 75 |uf get-b|uffer bu|
|000053c0| 66 66 65 72 2d 6e 61 6d | 65 20 53 74 61 72 74 42 |ffer-nam|e StartB|
|000053d0| 75 66 66 65 72 20 28 28 | 73 65 74 2d 62 75 66 66 |uffer ((|set-buff|
|000053e0| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|000053f0| 20 65 64 69 66 66 2d 63 | 6f 6e 74 72 6f 6c 2d 62 | ediff-c|ontrol-b|
|00005400| 75 66 66 65 72 20 65 64 | 69 66 66 2d 63 6f 6d 70 |uffer ed|iff-comp|
|00005410| 75 74 65 2d 63 75 73 74 | 6f 6d 2d 64 69 66 66 73 |ute-cust|om-diffs|
|00005420| 2d 6d 61 79 62 65 20 65 | 64 69 66 66 2d 63 75 73 |-maybe e|diff-cus|
|00005430| 74 6f 6d 2d 64 69 66 66 | 2d 62 75 66 66 65 72 20 |tom-diff|-buffer |
|00005440| 74 68 69 73 2d 63 6f 6d | 6d 61 6e 64 20 65 64 69 |this-com|mand edi|
|00005450| 66 66 2d 71 75 69 74 20 | 65 64 69 66 66 2d 4b 49 |ff-quit |ediff-KI|
|00005460| 4c 4c 45 44 2d 56 49 54 | 41 4c 2d 42 55 46 46 45 |LLED-VIT|AL-BUFFE|
|00005470| 52 20 22 45 64 69 66 66 | 3a 20 73 6f 6d 65 74 68 |R "Ediff|: someth|
|00005480| 69 6e 67 20 77 72 6f 6e | 67 2d 2d 6e 6f 20 6d 75 |ing wron|g--no mu|
|00005490| 6c 74 69 70 6c 65 20 64 | 69 66 66 73 20 62 75 66 |ltiple d|iffs buf|
|000054a0| 66 65 72 22 20 69 6e 73 | 65 72 74 2d 62 75 66 66 |fer" ins|ert-buff|
|000054b0| 65 72 20 22 5c 6e 22 20 | 28 65 64 69 66 66 2d 64 |er "\n" |(ediff-d|
|000054c0| 69 72 65 63 74 6f 72 69 | 65 73 20 65 64 69 66 66 |irectori|es ediff|
|000054d0| 2d 6d 65 72 67 65 2d 64 | 69 72 65 63 74 6f 72 69 |-merge-d|irectori|
|000054e0| 65 73 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 64 |es ediff|-merge-d|
|000054f0| 69 72 65 63 74 6f 72 69 | 65 73 2d 77 69 74 68 2d |irectori|es-with-|
|00005500| 61 6e 63 65 73 74 6f 72 | 29 20 67 65 74 2d 62 75 |ancestor|) get-bu|
|00005510| 66 66 65 72 2d 63 72 65 | 61 74 65 20 65 64 69 66 |ffer-cre|ate edif|
|00005520| 66 2d 74 6d 70 2d 62 75 | 66 66 65 72 20 65 72 61 |f-tmp-bu|ffer era|
|00005530| 73 65 2d 62 75 66 66 65 | 72 20 73 68 65 6c 6c 2d |se-buffe|r shell-|
|00005540| 63 6f 6d 6d 61 6e 64 20 | 66 6f 72 6d 61 74 20 22 |command |format "|
|00005550| 25 73 20 25 73 20 25 73 | 20 25 73 22 20 65 64 69 |%s %s %s| %s" edi|
|00005560| 66 66 2d 63 75 73 74 6f | 6d 2d 64 69 66 66 2d 70 |ff-custo|m-diff-p|
|00005570| 72 6f 67 72 61 6d 20 65 | 64 69 66 66 2d 63 75 73 |rogram e|diff-cus|
|00005580| 74 6f 6d 2d 64 69 66 66 | 2d 6f 70 74 69 6f 6e 73 |tom-diff|-options|
|00005590| 20 65 64 69 66 66 2d 67 | 65 74 2d 73 65 73 73 69 | ediff-g|et-sessi|
|000055a0| 6f 6e 2d 6f 62 6a 41 2d | 6e 61 6d 65 20 65 64 69 |on-objA-|name edi|
|000055b0| 66 66 2d 67 65 74 2d 73 | 65 73 73 69 6f 6e 2d 6f |ff-get-s|ession-o|
|000055c0| 62 6a 42 2d 6e 61 6d 65 | 20 74 20 22 43 61 6e 27 |bjB-name| t "Can'|
|000055d0| 74 20 6d 61 6b 65 20 63 | 6f 6e 74 65 78 74 20 64 |t make c|ontext d|
|000055e0| 69 66 66 20 66 6f 72 20 | 53 65 73 73 69 6f 6e 20 |iff for |Session |
|000055f0| 25 64 22 20 73 65 73 73 | 69 6f 6e 4e 75 6d 5d 20 |%d" sess|ionNum] |
|00005600| 39 5d 29 0a 23 40 33 30 | 30 20 43 6f 6c 6c 65 63 |9]).#@30|0 Collec|
|00005610| 74 20 63 75 73 74 6f 6d | 20 64 69 66 66 73 20 6f |t custom| diffs o|
|00005620| 66 20 6d 61 72 6b 65 64 | 20 73 65 73 73 69 6f 6e |f marked| session|
|00005630| 73 20 69 6e 20 62 75 66 | 66 65 72 20 60 2a 45 64 |s in buf|fer `*Ed|
|00005640| 69 66 66 20 4d 75 6c 74 | 69 66 69 6c 65 20 44 69 |iff Mult|ifile Di|
|00005650| 66 66 73 2a 27 2e 0a 54 | 68 69 73 20 6f 70 65 72 |ffs*'..T|his oper|
|00005660| 61 74 69 6f 6e 20 69 73 | 20 64 65 66 69 6e 65 64 |ation is| defined|
|00005670| 20 6f 6e 6c 79 20 66 6f | 72 20 60 65 64 69 66 66 | only fo|r `ediff|
|00005680| 2d 64 69 72 65 63 74 6f | 72 69 65 73 27 20 61 6e |-directo|ries' an|
|00005690| 64 0a 60 65 64 69 66 66 | 2d 64 69 72 65 63 74 6f |d.`ediff|-directo|
|000056a0| 72 79 2d 72 65 76 69 73 | 69 6f 6e 73 27 2c 20 73 |ry-revis|ions', s|
|000056b0| 69 6e 63 65 20 69 74 73 | 20 69 6e 74 65 6e 74 20 |ince its| intent |
|000056c0| 69 73 20 74 6f 20 70 72 | 6f 64 75 63 65 0a 6d 75 |is to pr|oduce.mu|
|000056d0| 6c 74 69 66 69 6c 65 20 | 70 61 74 63 68 65 73 2e |ltifile |patches.|
|000056e0| 20 46 6f 72 20 60 65 64 | 69 66 66 2d 64 69 72 65 | For `ed|iff-dire|
|000056f0| 63 74 6f 72 79 2d 72 65 | 76 69 73 69 6f 6e 73 27 |ctory-re|visions'|
|00005700| 2c 20 77 65 20 69 6e 73 | 69 73 74 20 74 68 61 74 |, we ins|ist that|
|00005710| 0a 61 6c 6c 20 6d 61 72 | 6b 65 64 20 73 65 73 73 |.all mar|ked sess|
|00005720| 69 6f 6e 73 20 6d 75 73 | 74 20 62 65 20 61 63 74 |ions mus|t be act|
|00005730| 69 76 65 2e 1f 0a 28 64 | 65 66 61 6c 69 61 73 20 |ive...(d|efalias |
|00005740| 27 65 64 69 66 66 2d 63 | 6f 6c 6c 65 63 74 2d 63 |'ediff-c|ollect-c|
|00005750| 75 73 74 6f 6d 2d 64 69 | 66 66 73 20 23 5b 6e 69 |ustom-di|ffs #[ni|
|00005760| 6c 20 22 08 83 12 00 c1 | 08 21 83 12 00 c2 c1 08 |l ".....|.!......|
|00005770| 21 21 84 19 00 c3 c4 c5 | c6 5c 22 21 10 70 1e 07 |!!......|.\"!.p..|
|00005780| 08 83 3a 00 c1 08 21 83 | 3a 00 c2 c1 08 21 21 83 |..:...!.|:....!!.|
|00005790| 3a 00 c8 8e 08 71 88 c9 | 20 88 29 82 46 00 0e 5c |:....q..| .).F..\|
|000057a0| 6e cb 3d 84 46 00 cc 0e | 0d 21 88 29 ce cf 21 d0 |n.=.F...|.!.)..!.|
|000057b0| 56 83 54 00 d1 08 d2 5c | 22 87 d3 20 88 d4 d5 21 |V.T....\|".. ...!|
|000057c0| 87 22 20 5b 65 64 69 66 | 66 2d 6d 65 74 61 2d 64 |." [edif|f-meta-d|
|000057d0| 69 66 66 2d 62 75 66 66 | 65 72 20 67 65 74 2d 62 |iff-buff|er get-b|
|000057e0| 75 66 66 65 72 20 62 75 | 66 66 65 72 2d 6e 61 6d |uffer bu|ffer-nam|
|000057f0| 65 20 67 65 74 2d 62 75 | 66 66 65 72 2d 63 72 65 |e get-bu|ffer-cre|
|00005800| 61 74 65 20 65 64 69 66 | 66 2d 75 6e 69 71 75 65 |ate edif|f-unique|
|00005810| 2d 62 75 66 66 65 72 2d | 6e 61 6d 65 20 22 2a 45 |-buffer-|name "*E|
|00005820| 64 69 66 66 20 4d 75 6c | 74 69 66 69 6c 65 20 44 |diff Mul|tifile D|
|00005830| 69 66 66 73 22 20 22 2a | 22 20 53 74 61 72 74 42 |iffs" "*|" StartB|
|00005840| 75 66 66 65 72 20 28 28 | 73 65 74 2d 62 75 66 66 |uffer ((|set-buff|
|00005850| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00005860| 20 65 72 61 73 65 2d 62 | 75 66 66 65 72 20 74 68 | erase-b|uffer th|
|00005870| 69 73 2d 63 6f 6d 6d 61 | 6e 64 20 65 64 69 66 66 |is-comma|nd ediff|
|00005880| 2d 71 75 69 74 20 65 72 | 72 6f 72 20 65 64 69 66 |-quit er|ror edif|
|00005890| 66 2d 4b 49 4c 4c 45 44 | 2d 56 49 54 41 4c 2d 42 |f-KILLED|-VITAL-B|
|000058a0| 55 46 46 45 52 20 65 64 | 69 66 66 2d 6f 70 65 72 |UFFER ed|iff-oper|
|000058b0| 61 74 65 2d 6f 6e 2d 6d | 61 72 6b 65 64 2d 73 65 |ate-on-m|arked-se|
|000058c0| 73 73 69 6f 6e 73 20 65 | 64 69 66 66 2d 61 70 70 |ssions e|diff-app|
|000058d0| 65 6e 64 2d 63 75 73 74 | 6f 6d 2d 64 69 66 66 20 |end-cust|om-diff |
|000058e0| 30 20 64 69 73 70 6c 61 | 79 2d 62 75 66 66 65 72 |0 displa|y-buffer|
|000058f0| 20 6e 6f 74 2d 74 68 69 | 73 2d 77 69 6e 64 6f 77 | not-thi|s-window|
|00005900| 20 62 65 65 70 20 6d 65 | 73 73 61 67 65 20 22 4e | beep me|ssage "N|
|00005910| 6f 20 6d 61 72 6b 65 64 | 20 73 65 73 73 69 6f 6e |o marked| session|
|00005920| 73 20 66 6f 75 6e 64 22 | 5d 20 34 20 28 23 24 20 |s found"|] 4 (#$ |
|00005930| 2e 20 32 32 30 32 36 29 | 20 6e 69 6c 5d 29 0a 23 |. 22026)| nil]).#|
|00005940| 40 36 33 20 53 68 6f 77 | 20 74 68 65 20 6d 75 6c |@63 Show| the mul|
|00005950| 74 69 2d 66 69 6c 65 20 | 70 61 74 63 68 20 61 73 |ti-file |patch as|
|00005960| 73 6f 63 69 61 74 65 64 | 20 77 69 74 68 20 74 68 |sociated| with th|
|00005970| 69 73 20 67 72 6f 75 70 | 20 73 65 73 73 69 6f 6e |is group| session|
|00005980| 2e 1f 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |...(defa|lias 'ed|
|00005990| 69 66 66 2d 6d 65 74 61 | 2d 73 68 6f 77 2d 70 61 |iff-meta|-show-pa|
|000059a0| 74 63 68 20 23 5b 6e 69 | 6c 20 22 c0 09 21 1a c3 |tch #[ni|l "..!..|
|000059b0| 09 21 1c c5 5c 66 5c 6e | c6 23 1e 07 0e 08 89 1e |.!..\f\n|.#......|
|000059c0| 09 83 80 00 ca 0e 09 21 | 83 80 00 cb ca 0e 09 21 |.......!|.......!|
|000059d0| 21 83 80 00 70 1e 5c 66 | 0e 09 83 71 00 ca 0e 09 |!...p.\f|...q....|
|000059e0| 21 83 71 00 cb ca 0e 09 | 21 21 83 71 00 cd 8e 0e |!.q.....|!!.q....|
|000059f0| 09 71 88 8c 0e 07 84 50 | 00 7e 88 82 5a 00 ce 0e |.q.....P|.~..Z...|
|00005a00| 07 21 cf 0e 07 21 7d 88 | d0 0e 11 21 71 88 d2 20 |.!...!}.|...!q.. |
|00005a10| 88 d3 0e 09 21 88 d4 0e | 11 d5 5c 22 2a 82 7c 00 |....!...|..\"*.|.|
|00005a20| 0e 16 d7 3d 86 7c 00 d8 | 0e 19 21 29 82 83 00 d8 |...=.|..|..!)....|
|00005a30| da 21 2c 87 22 20 5b 65 | 64 69 66 66 2d 65 76 65 |.!,." [e|diff-eve|
|00005a40| 6e 74 2d 70 6f 69 6e 74 | 20 6c 61 73 74 2d 63 6f |nt-point| last-co|
|00005a50| 6d 6d 61 6e 64 2d 65 76 | 65 6e 74 20 70 6f 73 20 |mmand-ev|ent pos |
|00005a60| 65 64 69 66 66 2d 65 76 | 65 6e 74 2d 62 75 66 66 |ediff-ev|ent-buff|
|00005a70| 65 72 20 6d 65 74 61 2d | 62 75 66 20 65 64 69 66 |er meta-|buf edif|
|00005a80| 66 2d 67 65 74 2d 6d 65 | 74 61 2d 69 6e 66 6f 20 |f-get-me|ta-info |
|00005a90| 6e 6f 65 72 72 6f 72 20 | 69 6e 66 6f 20 65 64 69 |noerror |info edi|
|00005aa0| 66 66 2d 6d 65 74 61 2d | 70 61 74 63 68 62 75 66 |ff-meta-|patchbuf|
|00005ab0| 65 72 20 70 61 74 63 68 | 62 75 66 66 65 72 20 67 |er patch|buffer g|
|00005ac0| 65 74 2d 62 75 66 66 65 | 72 20 62 75 66 66 65 72 |et-buffe|r buffer|
|00005ad0| 2d 6e 61 6d 65 20 53 74 | 61 72 74 42 75 66 66 65 |-name St|artBuffe|
|00005ae0| 72 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |r ((set-|buffer S|
|00005af0| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 65 64 69 |tartBuff|er)) edi|
|00005b00| 66 66 2d 67 65 74 2d 73 | 65 73 73 69 6f 6e 2d 6f |ff-get-s|ession-o|
|00005b10| 62 6a 42 2d 6e 61 6d 65 | 20 65 64 69 66 66 2d 67 |bjB-name| ediff-g|
|00005b20| 65 74 2d 73 65 73 73 69 | 6f 6e 2d 6f 62 6a 43 2d |et-sessi|on-objC-|
|00005b30| 6e 61 6d 65 20 67 65 74 | 2d 62 75 66 66 65 72 2d |name get|-buffer-|
|00005b40| 63 72 65 61 74 65 20 65 | 64 69 66 66 2d 74 6d 70 |create e|diff-tmp|
|00005b50| 2d 62 75 66 66 65 72 20 | 65 72 61 73 65 2d 62 75 |-buffer |erase-bu|
|00005b60| 66 66 65 72 20 69 6e 73 | 65 72 74 2d 62 75 66 66 |ffer ins|ert-buff|
|00005b70| 65 72 20 64 69 73 70 6c | 61 79 2d 62 75 66 66 65 |er displ|ay-buffe|
|00005b80| 72 20 6e 6f 74 2d 74 68 | 69 73 2d 77 69 6e 64 6f |r not-th|is-windo|
|00005b90| 77 20 74 68 69 73 2d 63 | 6f 6d 6d 61 6e 64 20 65 |w this-c|ommand e|
|00005ba0| 64 69 66 66 2d 71 75 69 | 74 20 65 72 72 6f 72 20 |diff-qui|t error |
|00005bb0| 65 64 69 66 66 2d 4b 49 | 4c 4c 45 44 2d 56 49 54 |ediff-KI|LLED-VIT|
|00005bc0| 41 4c 2d 42 55 46 46 45 | 52 20 22 54 68 65 20 70 |AL-BUFFE|R "The p|
|00005bd0| 61 74 63 68 20 62 75 66 | 66 65 72 20 77 61 73 6e |atch buf|fer wasn|
|00005be0| 27 74 20 66 6f 75 6e 64 | 22 5d 20 35 20 28 23 24 |'t found|"] 5 (#$|
|00005bf0| 20 2e 20 32 32 38 35 32 | 29 20 6e 69 6c 5d 29 0a | . 22852|) nil]).|
|00005c00| 23 40 35 34 20 45 78 65 | 63 75 74 65 20 61 70 70 |#@54 Exe|cute app|
|00005c10| 72 6f 70 72 69 61 74 65 | 20 61 63 74 69 6f 6e 20 |ropriate| action |
|00005c20| 66 6f 72 20 74 68 65 20 | 73 65 6c 65 63 74 65 64 |for the |selected|
|00005c30| 20 73 65 73 73 69 6f 6e | 2e 1f 0a 28 64 65 66 61 | session|...(defa|
|00005c40| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 66 69 6c 65 |lias 'ed|iff-file|
|00005c50| 67 72 6f 75 70 2d 61 63 | 74 69 6f 6e 20 23 5b 6e |group-ac|tion #[n|
|00005c60| 69 6c 20 22 c0 09 21 1a | c3 09 21 1c c5 5c 66 5c |il "..!.|..!..\f\|
|00005c70| 6e 5c 22 1e 06 c7 1e 08 | c7 1e 09 c7 1e 5c 6e c7 |n\".....|.....\n.|
|00005c80| 1e 0b c7 1e 5c 66 cd 0e | 06 21 16 08 ce 0e 06 21 |....\f..|.!.....!|
|00005c90| 16 09 cf 0e 06 21 16 5c | 6e d0 0e 06 21 16 0b d1 |.....!.\|n...!...|
|00005ca0| 0e 06 21 d2 3e 83 58 00 | d3 20 88 d4 d5 21 83 54 |..!.>.X.|. ...!.T|
|00005cb0| 00 d6 0e 06 c7 5c 22 88 | d7 5c 66 21 88 82 58 00 |.....\".|.\f!..X.|
|00005cc0| d8 d9 21 88 70 1e 1a 5c | 66 83 70 02 db 5c 66 21 |..!.p..\|f.p..\f!|
|00005cd0| 83 70 02 dc db 5c 66 21 | 21 83 70 02 dd 8e 5c 66 |.p...\f!|!.p...\f|
|00005ce0| 71 88 5c 6e 62 88 de 0e | 09 21 83 e3 00 0e 5c 6e |q.\nb...|.!....\n|
|00005cf0| 3b 83 e3 00 de 0e 5c 6e | 21 83 e3 00 0e 0b 3b 83 |;.....\n|!.....;.|
|00005d00| 96 00 de 0e 09 21 82 97 | 00 df 83 e3 00 0e 08 83 |.....!..|........|
|00005d10| b6 00 db 0e 08 21 83 b6 | 00 dc db 0e 08 21 21 83 |.....!..|.....!!.|
|00005d20| b6 00 e0 0e 08 21 82 6c | 02 e1 e2 c7 e3 23 16 5c |.....!.l|.....#.\|
|00005d30| 66 e4 0e 09 0e 5c 6e 0e | 0b 0e 5c 66 0e 25 0e 26 |f....\n.|..\f.%.&|
|00005d40| e7 e8 c7 e9 ea eb 0e 2c | 44 45 ed eb 0e 06 44 ee |.......,|DE....D.|
|00005d50| 42 42 46 44 26 07 82 6c | 02 c7 1e 2f c7 89 1e 2f |BBFD&..l|.../.../|
|00005d60| 86 ef 00 0e 26 f0 3e 29 | 86 02 01 0e 2f 89 1e 2f |....&.>)|..../../|
|00005d70| 86 ff 00 0e 26 f1 3e 29 | 29 83 5c 5c 01 c7 1e 2f |....&.>)|).\\.../|
|00005d80| 0e 26 f2 3e 29 83 5c 5c | 01 de 0e 09 21 83 5c 5c |.&.>).\\|....!.\\|
|00005d90| 01 0e 08 83 34 01 db 0e | 08 21 83 34 01 dc db 0e |....4...|.!.4....|
|00005da0| 08 21 21 83 34 01 e0 0e | 08 21 82 6c 02 e1 e2 c7 |.!!.4...|.!.l....|
|00005db0| e3 23 16 5c 66 f3 0e 09 | 0e 5c 66 0e 25 0e 26 e7 |.#.\f...|.\f.%.&.|
|00005dc0| e8 c7 e9 ea eb 0e 2c 44 | 45 ed eb 0e 06 44 f4 42 |......,D|E....D.B|
|00005dd0| 42 46 44 25 82 6c 02 0e | 08 83 a9 01 db 0e 08 21 |BFD%.l..|.......!|
|00005de0| 83 a9 01 dc db 0e 08 21 | 21 83 a9 01 70 1e 1a 0e |.......!|!...p...|
|00005df0| 08 83 9a 01 db 0e 08 21 | 83 9a 01 dc db 0e 08 21 |.......!|.......!|
|00005e00| 21 83 9a 01 f5 8e 0e 08 | 71 88 f6 20 16 37 f8 f9 |!.......|q.. .7..|
|00005e10| 21 29 82 a5 01 0e 3a fb | 3d 86 a5 01 d8 0e 3c 21 |!)....:.|=.....<!|
|00005e20| 29 82 6c 02 fd 0e 06 21 | 83 db 01 d3 20 88 d4 fe |).l....!|.... ...|
|00005e30| 21 83 d5 01 ff 0e 09 0e | 5c 6e e7 e8 c7 e9 ec 70 |!.......|\n.....p|
|00005e40| 45 ed eb 0e 06 44 81 40 | 00 42 42 46 44 23 82 6c |E....D.@|.BBFD#.l|
|00005e50| 02 d8 d9 21 82 6c 02 c7 | 1e 2f c7 89 1e 2f 86 e7 |...!.l..|./.../..|
|00005e60| 01 0e 26 f0 3e 29 86 fa | 01 0e 2f 89 1e 2f 86 f7 |..&.>)..|../../..|
|00005e70| 01 0e 26 f1 3e 29 29 83 | 19 02 0e 25 0e 09 e7 e8 |..&.>)).|...%....|
|00005e80| c7 e9 ec 70 45 ed eb 0e | 06 44 81 41 00 42 42 46 |...pE...|.D.A.BBF|
|00005e90| 44 5c 22 82 6c 02 c7 1e | 2f 0e 26 81 42 00 3e 29 |D\".l...|/.&.B.>)|
|00005ea0| 84 43 02 0e 25 0e 09 0e | 5c 6e e7 e8 c7 e9 ec 70 |.C..%...|\n.....p|
|00005eb0| 45 ed eb 0e 06 44 81 43 | 00 42 42 46 44 23 82 6c |E....D.C|.BBFD#.l|
|00005ec0| 02 c7 1e 2f 0e 26 81 42 | 00 3e 29 85 6c 02 0e 25 |.../.&.B|.>).l..%|
|00005ed0| 0e 09 0e 5c 6e 0e 0b e7 | e8 c7 e9 ec 70 45 ed eb |...\n...|....pE..|
|00005ee0| 0e 06 44 81 44 00 42 42 | 46 44 24 29 82 7b 02 0e |..D.D.BB|FD$).{..|
|00005ef0| 3a fb 3d 86 7b 02 d8 0e | 3c 21 2e 09 87 22 20 5b |:.=.{...|<!..." [|
|00005f00| 65 64 69 66 66 2d 65 76 | 65 6e 74 2d 70 6f 69 6e |ediff-ev|ent-poin|
|00005f10| 74 20 6c 61 73 74 2d 63 | 6f 6d 6d 61 6e 64 2d 65 |t last-c|ommand-e|
|00005f20| 76 65 6e 74 20 70 6f 73 | 20 65 64 69 66 66 2d 65 |vent pos| ediff-e|
|00005f30| 76 65 6e 74 2d 62 75 66 | 66 65 72 20 6d 65 74 61 |vent-buf|fer meta|
|00005f40| 2d 62 75 66 20 65 64 69 | 66 66 2d 67 65 74 2d 6d |-buf edi|ff-get-m|
|00005f50| 65 74 61 2d 69 6e 66 6f | 20 69 6e 66 6f 20 6e 69 |eta-info| info ni|
|00005f60| 6c 20 73 65 73 73 69 6f | 6e 2d 62 75 66 20 66 69 |l sessio|n-buf fi|
|00005f70| 6c 65 31 20 66 69 6c 65 | 32 20 66 69 6c 65 33 20 |le1 file|2 file3 |
|00005f80| 72 65 67 65 78 70 20 65 | 64 69 66 66 2d 67 65 74 |regexp e|diff-get|
|00005f90| 2d 73 65 73 73 69 6f 6e | 2d 62 75 66 66 65 72 20 |-session|-buffer |
|00005fa0| 65 64 69 66 66 2d 67 65 | 74 2d 73 65 73 73 69 6f |ediff-ge|t-sessio|
|00005fb0| 6e 2d 6f 62 6a 41 2d 6e | 61 6d 65 20 65 64 69 66 |n-objA-n|ame edif|
|00005fc0| 66 2d 67 65 74 2d 73 65 | 73 73 69 6f 6e 2d 6f 62 |f-get-se|ssion-ob|
|00005fd0| 6a 42 2d 6e 61 6d 65 20 | 65 64 69 66 66 2d 67 65 |jB-name |ediff-ge|
|00005fe0| 74 2d 73 65 73 73 69 6f | 6e 2d 6f 62 6a 43 2d 6e |t-sessio|n-objC-n|
|00005ff0| 61 6d 65 20 65 64 69 66 | 66 2d 67 65 74 2d 73 65 |ame edif|f-get-se|
|00006000| 73 73 69 6f 6e 2d 73 74 | 61 74 75 73 20 28 37 33 |ssion-st|atus (73|
|00006010| 29 20 62 65 65 70 20 79 | 2d 6f 72 2d 6e 2d 70 20 |) beep y|-or-n-p |
|00006020| 22 54 68 69 73 20 73 65 | 73 73 69 6f 6e 20 69 73 |"This se|ssion is|
|00006030| 20 6d 61 72 6b 65 64 20 | 61 73 20 68 69 64 64 65 | marked |as hidde|
|00006040| 6e 2c 20 75 6e 6d 61 72 | 6b 3f 20 22 20 65 64 69 |n, unmar|k? " edi|
|00006050| 66 66 2d 73 65 74 2d 73 | 65 73 73 69 6f 6e 2d 73 |ff-set-s|ession-s|
|00006060| 74 61 74 75 73 20 65 64 | 69 66 66 2d 75 70 64 61 |tatus ed|iff-upda|
|00006070| 74 65 2d 6d 65 74 61 2d | 62 75 66 66 65 72 20 65 |te-meta-|buffer e|
|00006080| 72 72 6f 72 20 22 41 62 | 6f 72 74 65 64 22 20 53 |rror "Ab|orted" S|
|00006090| 74 61 72 74 42 75 66 66 | 65 72 20 67 65 74 2d 62 |tartBuff|er get-b|
|000060a0| 75 66 66 65 72 20 62 75 | 66 66 65 72 2d 6e 61 6d |uffer bu|ffer-nam|
|000060b0| 65 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |e ((set-|buffer S|
|000060c0| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 66 69 6c |tartBuff|er)) fil|
|000060d0| 65 2d 64 69 72 65 63 74 | 6f 72 79 2d 70 20 74 20 |e-direct|ory-p t |
|000060e0| 65 64 69 66 66 2d 73 68 | 6f 77 2d 6d 65 74 61 2d |ediff-sh|ow-meta-|
|000060f0| 62 75 66 66 65 72 20 72 | 65 61 64 2d 73 74 72 69 |buffer r|ead-stri|
|00006100| 6e 67 20 22 46 69 6c 74 | 65 72 20 74 68 72 6f 75 |ng "Filt|er throu|
|00006110| 67 68 20 72 65 67 75 6c | 61 72 20 65 78 70 72 65 |gh regul|ar expre|
|00006120| 73 73 69 6f 6e 3a 20 22 | 20 65 64 69 66 66 2d 66 |ssion: "| ediff-f|
|00006130| 69 6c 74 65 72 69 6e 67 | 2d 72 65 67 65 78 70 2d |iltering|-regexp-|
|00006140| 68 69 73 74 6f 72 79 20 | 65 64 69 66 66 2d 64 69 |history |ediff-di|
|00006150| 72 65 63 74 6f 72 69 65 | 73 2d 69 6e 74 65 72 6e |rectorie|s-intern|
|00006160| 61 6c 20 65 64 69 66 66 | 2d 73 65 73 73 69 6f 6e |al ediff|-session|
|00006170| 2d 61 63 74 69 6f 6e 2d | 66 75 6e 63 74 69 6f 6e |-action-|function|
|00006180| 20 65 64 69 66 66 2d 6d | 65 74 61 6a 6f 62 2d 6e | ediff-m|etajob-n|
|00006190| 61 6d 65 20 6c 69 73 74 | 20 6c 61 6d 62 64 61 20 |ame list| lambda |
|000061a0| 73 65 74 71 20 65 64 69 | 66 66 2d 70 61 72 65 6e |setq edi|ff-paren|
|000061b0| 74 2d 6d 65 74 61 2d 62 | 75 66 66 65 72 20 71 75 |t-meta-b|uffer qu|
|000061c0| 6f 74 65 20 65 64 69 66 | 66 2d 6d 65 74 61 2d 62 |ote edif|f-meta-b|
|000061d0| 75 66 66 65 72 20 73 65 | 74 63 61 72 20 28 65 64 |uffer se|tcar (ed|
|000061e0| 69 66 66 2d 6d 65 74 61 | 2d 62 75 66 66 65 72 29 |iff-meta|-buffer)|
|000061f0| 20 6d 65 74 61 6a 6f 62 | 20 28 65 64 69 66 66 2d | metajob| (ediff-|
|00006200| 64 69 72 65 63 74 6f 72 | 79 2d 72 65 76 69 73 69 |director|y-revisi|
|00006210| 6f 6e 73 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |ons edif|f-merge-|
|00006220| 64 69 72 65 63 74 6f 72 | 79 2d 72 65 76 69 73 69 |director|y-revisi|
|00006230| 6f 6e 73 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |ons edif|f-merge-|
|00006240| 64 69 72 65 63 74 6f 72 | 79 2d 72 65 76 69 73 69 |director|y-revisi|
|00006250| 6f 6e 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |ons-with|-ancesto|
|00006260| 72 29 20 28 65 64 69 66 | 66 2d 6d 75 6c 74 69 66 |r) (edif|f-multif|
|00006270| 69 6c 65 2d 70 61 74 63 | 68 29 20 28 65 64 69 66 |ile-patc|h) (edif|
|00006280| 66 2d 64 69 72 65 63 74 | 6f 72 79 2d 72 65 76 69 |f-direct|ory-revi|
|00006290| 73 69 6f 6e 73 20 65 64 | 69 66 66 2d 6d 65 72 67 |sions ed|iff-merg|
|000062a0| 65 2d 64 69 72 65 63 74 | 6f 72 79 2d 72 65 76 69 |e-direct|ory-revi|
|000062b0| 73 69 6f 6e 73 20 65 64 | 69 66 66 2d 6d 65 72 67 |sions ed|iff-merg|
|000062c0| 65 2d 64 69 72 65 63 74 | 6f 72 79 2d 72 65 76 69 |e-direct|ory-revi|
|000062d0| 73 69 6f 6e 73 2d 77 69 | 74 68 2d 61 6e 63 65 73 |sions-wi|th-ances|
|000062e0| 74 6f 72 29 20 65 64 69 | 66 66 2d 64 69 72 65 63 |tor) edi|ff-direc|
|000062f0| 74 6f 72 79 2d 72 65 76 | 69 73 69 6f 6e 73 2d 69 |tory-rev|isions-i|
|00006300| 6e 74 65 72 6e 61 6c 20 | 28 65 64 69 66 66 2d 6d |nternal |(ediff-m|
|00006310| 65 74 61 2d 62 75 66 66 | 65 72 29 20 28 28 73 65 |eta-buff|er) ((se|
|00006320| 74 2d 62 75 66 66 65 72 | 20 53 74 61 72 74 42 75 |t-buffer| StartBu|
|00006330| 66 66 65 72 29 29 20 6d | 6f 75 73 65 2d 70 69 78 |ffer)) m|ouse-pix|
|00006340| 65 6c 2d 70 6f 73 69 74 | 69 6f 6e 20 65 64 69 66 |el-posit|ion edif|
|00006350| 66 2d 6d 6f 75 73 65 2d | 70 69 78 65 6c 2d 70 6f |f-mouse-|pixel-po|
|00006360| 73 69 74 69 6f 6e 20 65 | 64 69 66 66 2d 72 65 63 |sition e|diff-rec|
|00006370| 65 6e 74 65 72 20 6e 6f | 2d 72 65 68 69 67 68 6c |enter no|-rehighl|
|00006380| 69 67 68 74 20 74 68 69 | 73 2d 63 6f 6d 6d 61 6e |ight thi|s-comman|
|00006390| 64 20 65 64 69 66 66 2d | 71 75 69 74 20 65 64 69 |d ediff-|quit edi|
|000063a0| 66 66 2d 4b 49 4c 4c 45 | 44 2d 56 49 54 41 4c 2d |ff-KILLE|D-VITAL-|
|000063b0| 42 55 46 46 45 52 20 65 | 64 69 66 66 2d 70 72 6f |BUFFER e|diff-pro|
|000063c0| 62 6c 65 6d 61 74 69 63 | 2d 73 65 73 73 69 6f 6e |blematic|-session|
|000063d0| 2d 70 20 22 54 68 69 73 | 20 73 65 73 73 69 6f 6e |-p "This| session|
|000063e0| 27 73 20 61 6e 63 65 73 | 74 6f 72 20 69 73 20 61 |'s ances|tor is a|
|000063f0| 20 64 69 72 65 63 74 6f | 72 79 2c 20 6d 65 72 67 | directo|ry, merg|
+--------+-------------------------+-------------------------+--------+--------+